Liang Qi 3e949b75fd Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: mkspecs/features/mac/default_pre.prf mkspecs/macx-ios-clang/features/resolve_config.prf qtbase.pro Change-Id: I65b5ebca4942a4f295bdd4ac1568e5c347333aea		2016-10-01 22:15:55 +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	qmake: eradicate Q_FOREACH loops [already const]	2016-01-28 20:25:21 +00:00
proitems.h	add ProString::toLongLong() and make use of it	2016-05-19 17:32:50 +00:00
qmake_global.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-01 22:15:55 +02:00
qmakeevaluator_p.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakeevaluator.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-01 22:15:55 +02:00
qmakeevaluator.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
qmakeglobals.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-20 08:00:26 +02:00
qmakeglobals.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakeparser.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
qmakeparser.h	Updated license headers	2016-01-21 18:55:18 +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