Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +02:00
..
qatomicint	Update copyright headers	2015-02-11 06:49:51 +00:00
qatomicinteger	Add missing fetchAndXxx methods to atomic classes based on std::atomic	2015-03-05 00:05:00 +00:00
qatomicpointer	Update copyright headers	2015-02-11 06:49:51 +00:00
qfuture	Update copyright headers	2015-02-11 06:49:51 +00:00
qfuturesynchronizer	Update copyright headers	2015-02-11 06:49:51 +00:00
qfuturewatcher	Update copyright headers	2015-02-11 06:49:51 +00:00
qmutex	Update copyright headers	2015-02-11 06:49:51 +00:00
qmutexlocker	Update copyright headers	2015-02-11 06:49:51 +00:00
qreadlocker	Update copyright headers	2015-02-11 06:49:51 +00:00
qreadwritelock	Update copyright headers	2015-02-11 06:49:51 +00:00
qresultstore	Update copyright headers	2015-02-11 06:49:51 +00:00
qsemaphore	Blacklist tryAcquireWithTimeout	2015-06-20 15:25:35 +00:00
qthread	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
qthreadonce	Update copyright headers	2015-02-11 06:49:51 +00:00
qthreadpool	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qthreadstorage	Do not search test binary if QProcess is not supported.	2015-03-23 08:38:58 +00:00
qwaitcondition	Update copyright headers	2015-02-11 06:49:51 +00:00
qwritelocker	Update copyright headers	2015-02-11 06:49:51 +00:00
thread.pro	Replace the type-based QAtomicIntegerTraits with a size-based one	2014-01-30 18:06:27 +01:00