AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
bd75876e7e
qt5base-lts/src/corelib/thread
History
Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
2016-11-01 06:02:55 +01:00
..
qatomic.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-25 14:03:45 +02:00
qatomic.h Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qbasicatomic.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
qexception.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-01-21 08:17:21 +01:00
qexception.h Merge remote-tracking branch 'origin/5.6' into dev 2016-01-21 08:17:21 +01:00
qfuture.h QFuture(Interface): remove unneeded special member functions 2016-08-13 05:34:51 +00:00
qfuture.qdoc Updated license headers 2016-01-15 12:25:24 +00:00
qfutureinterface_p.h Make sure all private headers in Qt Core include qglobal_p.h 2016-06-25 08:01:04 +00:00
qfutureinterface.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-25 16:12:11 +02:00
qfutureinterface.h QFuture(Interface): remove unneeded special member functions 2016-08-13 05:34:51 +00:00
qfuturesynchronizer.h Updated license headers 2016-01-15 12:25:24 +00:00
qfuturesynchronizer.qdoc Updated license headers 2016-01-15 12:25:24 +00:00
qfuturewatcher_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qfuturewatcher.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qfuturewatcher.h Updated license headers 2016-01-15 12:25:24 +00:00
qgenericatomic.h Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qmutex_linux.cpp Fix use of QMutex on Linux before FUTEX_PRIVATE_FLAG was added 2016-05-26 18:31:22 +00:00
qmutex_mac.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qmutex_p.h Make sure all private headers in Qt Core include qglobal_p.h 2016-06-25 08:01:04 +00:00
qmutex_unix.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qmutex_win.cpp QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
qmutex.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-08-29 15:30:17 +02:00
qmutex.h Correct the C++ standard references in QMutex functions 2016-09-16 15:33:46 +00:00
qmutexpool_p.h Standardize some "We mean it" comments 2016-08-17 19:51:40 +00:00
qmutexpool.cpp Revert "QMutexPool: avoid QVarLengthArray of QAtomicPointers" 2016-05-24 17:54:54 +00:00
qorderedmutexlocker_p.h Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qreadwritelock_p.h Make sure all private headers in Qt Core include qglobal_p.h 2016-06-25 08:01:04 +00:00
qreadwritelock.cpp QReadWriteLock fast path for tryLock without timeout 2016-07-15 06:33:56 +00:00
qreadwritelock.h Optimized implementation of QReadWriteLock 2016-03-11 13:32:13 +00:00
qresultstore.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qresultstore.h Updated license headers 2016-01-15 12:25:24 +00:00
qrunnable.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qrunnable.h Updated license headers 2016-01-15 12:25:24 +00:00
qsemaphore.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qsemaphore.h Updated license headers 2016-01-15 12:25:24 +00:00
qthread_p.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
qthread_unix.cpp Add support for Apple watchOS 2016-08-19 21:05:55 +00:00
qthread_win.cpp Windows: stop using _beginthreadex on regular builds 2016-06-02 22:16:47 +00:00
qthread.cpp QThread: make it fatal to destroy a running QThread 2016-07-19 11:28:55 +00:00
qthread.h Mark QThread::currentThreadId() as a pure function 2016-05-08 06:51:27 +00:00
qthreadpool_p.h Updated license headers 2016-01-15 12:25:24 +00:00
qthreadpool.cpp CoreLib: use const (and const APIs) more 2016-04-18 04:49:19 +00:00
qthreadpool.h Updated license headers 2016-01-15 12:25:24 +00:00
qthreadstorage.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qthreadstorage.h Updated license headers 2016-01-15 12:25:24 +00:00
qwaitcondition_unix.cpp Optimized implementation of QReadWriteLock 2016-03-11 13:32:13 +00:00
qwaitcondition_win.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-05-03 15:49:15 +02:00
qwaitcondition.h QWaitCondition: add notify_one/notify_all, i.e. STL naming 2016-07-30 12:10:29 +00:00
qwaitcondition.qdoc QWaitCondition: add notify_one/notify_all, i.e. STL naming 2016-07-30 12:10:29 +00:00
thread.pri Revert "Don't add qmutex_xxx.cpp to SOURCES, as qmutex.cpp #include's them" 2016-03-07 14:09:45 +00:00