Liang Qi 38c1057f69 Merge remote-tracking branch 'origin/5.6' into 5.7 ... This also reverts commit 0d2f0164f4. Conflicts: header.BSD-NEW qmake/Makefile.win32 src/openglextensions/qopenglextensions.cpp src/openglextensions/qopenglextensions.h src/winmain/qtmain_win.cpp src/winmain/qtmain_winrt.cpp tools/configure/configureapp.cpp util/glgen/qopenglextensions.cpp.header util/glgen/qopenglextensions.h.header Change-Id: If26c6f4111b342378dd88bbdc657e322d2ab6ad8		2016-11-23 09:24:36 +01:00
..
qatomicint	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qatomicinteger	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-24 20:37:33 +01:00
qatomicpointer	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qfuture	Updated license headers	2016-01-21 18:55:18 +00:00
qfuturesynchronizer	Updated license headers	2016-01-21 18:55:18 +00:00
qfuturewatcher	Updated license headers	2016-01-21 18:55:18 +00:00
qmutex	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qmutexlocker	Updated license headers	2016-01-21 18:55:18 +00:00
qreadlocker	Updated license headers	2016-01-21 18:55:18 +00:00
qreadwritelock	Updated license headers	2016-01-21 18:55:18 +00:00
qresultstore	Updated license headers	2016-01-21 18:55:18 +00:00
qsemaphore	Updated license headers	2016-01-21 18:55:18 +00:00
qthread	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-23 09:24:36 +01:00
qthreadonce	Updated license headers	2016-01-21 18:55:18 +00:00
qthreadpool	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qthreadstorage	Updated license headers	2016-01-21 18:55:18 +00:00
qwaitcondition	Updated license headers	2016-01-21 18:55:18 +00:00
qwritelocker	Updated license headers	2016-01-21 18:55:18 +00:00
thread.pro	Replace the type-based QAtomicIntegerTraits with a size-based one	2014-01-30 18:06:27 +01:00