AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7d257aab81
qt5base-lts/tests/auto/corelib/thread
History
Liang Qi beb65dcd79 Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/gui/painting/painting.pri
	src/plugins/platforms/xcb/qxcbconnection.cpp
	tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
	tests/auto/corelib/tools/qlocale/test/test.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
	tools/configure/environment.cpp

Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
2015-12-18 08:37:31 +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 Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
qthreadstorage Merge remote-tracking branch 'origin/5.6' into dev 2015-12-18 08:37:31 +01:00
qwaitcondition Merge remote-tracking branch 'origin/5.6' into dev 2015-11-27 08:27:53 +01: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