Liang Qi b131503361 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: configure configure.pri examples/widgets/painting/fontsampler/mainwindow.cpp examples/widgets/painting/fontsampler/mainwindow.h mkspecs/features/moc.prf src/corelib/global/qglobal.h src/gui/text/qtextdocument.cpp Change-Id: Ica65512e00871695190a14ccea5c275b0165f787		2016-12-16 16:38:33 +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	make QMakeEvaluator::isActiveConfig() take a QStringRef argument	2016-05-24 12:38:53 +00: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	Updated license headers	2016-01-21 18:55:18 +00:00
qmakeevaluator.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-16 16:38:33 +01:00
qmakeevaluator.h	make qmake abort when $$prompt() gets EOF	2016-12-13 18:55:19 +00:00
qmakeglobals.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-21 08:39:41 +02:00
qmakeglobals.h	move generation of qconfig.cpp (and qt.conf) to qmake-based configure	2016-12-13 18:56:12 +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