Liang Qi d90b155c60 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: mkspecs/macx-ios-clang/features/resolve_config.prf src/testlib/qtestcase.qdoc Change-Id: Icefa63056ffb37106f35299a8f19165535571799		2016-10-17 11:02:54 +02:00
..
animation	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-10 23:27:10 +02:00
arch	Bypass a bug in gcc 4.7 for QAtomicTraits::isLockFree()	2016-08-23 10:10:38 +00:00
codecs	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-25 14:03:45 +02:00
doc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-21 07:14:40 +02:00
global	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-05 19:33:26 +02:00
io	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-08 17:15:55 +02:00
itemmodels	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-21 07:14:40 +02:00
json	QtJson: simplify/add missing relational operators involving Latin1String	2016-08-26 08:25:31 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-08 17:15:55 +02:00
mimetypes	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-17 11:02:54 +02:00
plugin	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
statemachine	QtCore/QtDBus/QtSql: port the last remaining Q_FOREACH loop and add QT_NO_FOREACH	2016-05-11 16:55:37 +00:00
thread	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +02:00
tools	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-17 11:02:54 +02:00
xml	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-26 10:43:29 +02:00
corelib.pro	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-23 10:29:37 +02:00
eval.pri	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
Qt5Config.cmake.in	Check that files we expect to find actually exist when using a cmake package.	2013-05-20 15:20:26 +02:00
Qt5CoreConfigExtras.cmake.in	Revert "CMake: Add imported target for qdoc."	2016-07-05 14:40:29 +00:00
Qt5CoreConfigExtrasMkspecDir.cmake.in	Generate the directory for the mkspec include in a helper file.	2013-06-21 18:58:54 +02:00
Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in	Generate the directory for the mkspec include in a helper file.	2013-06-21 18:58:54 +02:00
Qt5CoreMacros.cmake	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-12 11:07:56 +01:00
Qt5CTestMacros.cmake	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-04 08:59:18 +02:00
QtCore.dynlist	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qtzlib.pro	make a proper header-only module for QtZlib	2015-11-17 20:22:17 +00:00