Liang Qi 4159ee8405 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: config.tests/unix/ptrsize.test configure src/corelib/global/qnamespace.h src/network/socket/qabstractsocket.cpp tests/auto/other/networkselftest/networkselftest.pro Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672		2015-11-04 20:18:14 +01:00
..
.gitignore	Moving relevant tests to corelib/io	2011-08-31 10:08:38 +02:00
android_testdata.qrc	Android: Fix QIODevice tests	2014-12-22 09:27:44 +01:00
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qiodevice.pro	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.	2015-09-01 16:57:46 +00:00
tst_qiodevice.cpp	QIODevice: fix interleaving read() and write() in text mode under Windows	2015-10-27 18:24:34 +00:00