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	Move QFutureWatcher back to QtCore	2012-09-28 23:50:10 +02:00
qfuturewatcher.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qfuturewatcher.cpp	Fix pauseEvents() test to test what should be true, not what is.	2015-11-02 09:40:32 +00:00