Liang Qi dd756011da Merge remote-tracking branch 'origin/5.8' into 5.9 ... Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f		2017-02-08 15:49:18 +01: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	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
proitems.h	qmake: introduce magic bypassNesting() scope	2016-12-13 18:56:20 +00:00
qmake_global.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	move generation of qconfig.cpp (and qt.conf) to qmake-based configure	2016-12-13 18:56:12 +00:00
qmakeevaluator_p.h	make QMAKE_DIR_SEP magic on writing	2016-12-20 10:16:32 +00:00
qmakeevaluator.cpp	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-02-08 15:49:18 +01:00
qmakeevaluator.h	make qmake abort when $$prompt() gets EOF	2016-12-13 18:55:19 +00:00
qmakeglobals.cpp	add a bunch of complementary options to -after	2017-02-06 16:34:17 +00:00
qmakeglobals.h	add a bunch of complementary options to -after	2017-02-06 16:34:17 +00:00
qmakeparser.cpp	qmake: introduce magic bypassNesting() scope	2016-12-13 18:56:20 +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