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
..
qatomicint	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qatomicinteger	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-23 14:45:03 +02:00
qatomicpointer	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qfuture	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qfuturesynchronizer	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qfuturewatcher	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
qmutex	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qmutexlocker	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qreadlocker	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qreadwritelock	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qresultstore	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qsemaphore	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.	2015-09-01 16:57:46 +00:00
qthread	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qthreadonce	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qthreadpool	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qthreadstorage	Merge remote-tracking branch 'origin/5.6' into dev	2015-09-25 14:02:04 +02:00
qwaitcondition	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qwritelocker	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
thread.pro	Replace the type-based QAtomicIntegerTraits with a size-based one	2014-01-30 18:06:27 +01:00