whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/corelib/thread
History
Liang Qi 790aef362f Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	.qmake.conf
	configure
	src/corelib/global/qglobal.h
	src/tools/qdoc/node.cpp
	src/tools/qdoc/qdocdatabase.cpp
	tests/auto/corelib/io/qsettings/tst_qsettings.cpp
	tools/configure/configureapp.cpp

Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
 		2015-10-23 14:45:03 +02: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-10-14 15:45:35 +02: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