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 72f5867f14 Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/corelib/kernel/qcoreapplication.cpp
	src/corelib/kernel/qeventdispatcher_blackberry.cpp
	src/network/bearer/qnetworkconfiguration.cpp
	src/plugins/bearer/blackberry/qbbengine.cpp
	src/plugins/platforms/android/androidjnimain.cpp
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/plugins/platforms/qnx/qqnxbpseventfilter.cpp
	src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
	src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxnavigatorbps.cpp
	src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp
	src/plugins/platforms/qnx/qqnxwindow.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	src/widgets/styles/qwindowsvistastyle.cpp
	src/widgets/styles/qwindowsxpstyle.cpp
	src/widgets/widgets/qtoolbararealayout.cpp
	tests/auto/corelib/global/qflags/qflags.pro
	tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
	tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp

Change-Id: I37be88c6c185bb85404823353e027a0a6acdbce4
 		2015-12-02 23:33:06 +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-09-25 14:02:04 +02: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