Liang Qi e32f1a4d61 Merge remote-tracking branch 'origin/5.6' into 5.7 ... And blacklisted a few tests in tst_QUdpSocket. Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtNative.java src/corelib/global/qglobal.cpp src/corelib/global/qsystemdetection.h src/corelib/io/qfileselector.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp tests/auto/network/socket/qudpsocket/BLACKLIST Task-number: QTBUG-54205 Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6		2016-06-20 08:00:26 +02:00
..
stressTest	Updated license headers	2016-01-21 18:55:18 +00:00
test	tst_QTcpSocket: Replace insignification on Windows by BLACKLIST.	2016-06-10 21:48:54 +00:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	tst_QTcpSocket: Replace insignification on Windows by BLACKLIST.	2016-06-10 21:48:54 +00:00
qtcpsocket.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00
tst_qtcpsocket.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00