whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/network/socket/platformsocketengine
History
Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/global/qglobal.cpp
	src/corelib/tools/qstring.cpp
	src/network/socket/qabstractsocket.cpp
	src/network/socket/qnativesocketengine_unix.cpp
	src/plugins/platforms/eglfs/api/qeglfsglobal.h

Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
 		2016-08-16 07:58:32 +02:00
..
.gitignore Moved network autotests into new directory structure 2011-09-09 09:32:17 +02:00
BLACKLIST Blacklist and skip various tests that are flakey 2015-06-14 10:50:45 +00:00
platformsocketengine.pri QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
platformsocketengine.pro QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2014-02-25 16:47:13 +01:00
tst_platformsocketengine.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00