Edward Welbourne 82ea53ad24 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: qmake/library/qmakeevaluator.cpp One side changed the iterator to use ranged-for, the other changed its body; they only conflicted because the latter had to add braces around the body, intruding on the for-line. Trivial resolution. Change-Id: Ib487bc3bd6e3c5225db15f94b9a8f6caaa33456b		2016-07-15 20:47:57 +02:00
..
doc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-20 08:00:26 +02:00
generators	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-20 08:00:26 +02:00
library	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
cachekeys.h	Updated license headers	2016-01-21 18:55:18 +00:00
main.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
Makefile.unix	qmake/tools: port the last remaining Q_FOREACH loops and add QT_NO_FOREACH	2016-05-11 16:55:32 +00:00
Makefile.win32	qmake/tools: port the last remaining Q_FOREACH loops and add QT_NO_FOREACH	2016-05-11 16:55:32 +00: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.6' into 5.7	2016-07-15 20:47:57 +02:00
project.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +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	nuke gbuild generator	2015-02-02 11:14:34 +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