Liang Qi 7950b6b283 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/tools/qbytearray.h src/corelib/tools/qdatetime.h src/corelib/tools/qstring.h src/corelib/tools/qversionnumber.h src/plugins/platforms/android/qandroidplatformintegration.cpp tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d		2017-04-20 12:31:27 +02:00
..
ioutils.cpp	Preserve last modification timestamps of installed files	2017-04-12 15:50:51 +00:00
ioutils.h	Preserve last modification timestamps of installed files	2017-04-12 15:50:51 +00:00
proitems.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
proitems.h	qmake: use new QString::arg(QStringView) overload	2017-04-07 18:33:23 +00:00
qmake_global.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	Merge remote-tracking branch 'origin/5.9' into dev	2017-04-20 12:31:27 +02:00
qmakeevaluator.cpp	qmake: use new QString::arg(QStringView) overload	2017-04-07 18:33:23 +00:00
qmakeevaluator.h	qmake: Check for QT_CONFIG(process) in qmakebuiltins	2017-03-06 14:16:08 +00:00
qmakeevaluator_p.h	make QMAKE_DIR_SEP magic on writing	2016-12-20 10:16:32 +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