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
..
doc	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-08-29 15:30:17 +02:00
generators	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
library	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
cachekeys.h	Updated license headers	2016-01-21 18:55:18 +00:00
main.cpp	moc: get the system #defines from the compiler itself	2016-07-20 02:54:03 +00:00
Makefile.unix	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
Makefile.win32	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
meta.cpp	qmake: eradicate Q_FOREACH loops [needing qAsConst()]	2016-01-28 20:25:18 +00:00
meta.h	Updated license headers	2016-01-21 18:55:18 +00:00
option.cpp	qmake: use reserve to optimize memory allocation.	2016-02-01 20:57:59 +00:00
option.h	qmake: eradicate Q_FOREACH loops [already const]	2016-01-28 20:25:21 +00:00
project.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
project.h	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
property.cpp	qmake: eradicate Q_FOREACH loops [needing qAsConst()]	2016-01-28 20:25:18 +00:00
property.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmake_pch.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmake-aux.pro	configure: Separate host and build platform.	2015-10-30 13:14:51 +00:00
qmake.pri	Clean up building of bootstrap lib and tools	2016-10-11 06:04:54 +00:00
qmake.pro	qmake/tools: port the last remaining Q_FOREACH loops and add QT_NO_FOREACH	2016-05-11 16:55:32 +00:00