Liang Qi dfc177e3a9 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: qmake/library/qmakeevaluator.cpp (cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools) src/corelib/kernel/qcore_mac_objc.mm src/gui/painting/qcolor.h src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31		2016-10-13 09:49:38 +02:00
..
ioutils.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
ioutils.h	Updated license headers	2016-01-21 18:55:18 +00:00
proitems.cpp	make QMakeEvaluator::isActiveConfig() take a QStringRef argument	2016-05-24 12:38:53 +00:00
proitems.h	fix build with QT_NO_CAST_FROM_ASCII	2016-10-07 11:21:17 +00:00
qmake_global.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-06 20:12:27 +02:00
qmakeevaluator_p.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakeevaluator.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
qmakeevaluator.h	add support for returning the command's exit status to $$system()	2016-08-10 15:42:29 +00:00
qmakeglobals.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-21 08:39:41 +02:00
qmakeglobals.h	introduce a new way to pass arbitrary arguments to the project file	2016-05-17 15:30:38 +00:00
qmakeparser.cpp	add discard_from() function	2016-08-25 11:56:07 +00:00
qmakeparser.h	add discard_from() function	2016-08-25 11:56:07 +00:00
qmakevfs.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-01 22:15:55 +02:00
qmakevfs.h	Updated license headers	2016-01-21 18:55:18 +00:00