Liang Qi 261a87f956 Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: qmake/generators/makefile.cpp Change-Id: Ib3715e626f2fd32804c75c16ea9aa06a1216e76d		2019-07-22 06:50:42 +02:00
..
ioutils.cpp	…
ioutils.h	…
proitems.cpp	QMake: be less laissez-faire with implicit conversions to QChar	2019-07-15 10:56:00 +02:00
proitems.h	Merge remote-tracking branch 'origin/5.13' into dev	2019-07-22 06:50:42 +02:00
qmake_global.h	…
qmakebuiltins.cpp	…
qmakeevaluator.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-07-17 10:44:21 +02:00
qmakeevaluator.h	qmake: replace QLinkedList with std::list	2019-05-13 19:18:59 +00:00
qmakeevaluator_p.h	…
qmakeglobals.cpp	…
qmakeglobals.h	…
qmakeparser.cpp	QMake: be less laissez-faire with implicit conversions to QChar	2019-07-15 10:56:00 +02:00
qmakeparser.h	QMake: fix GCC 9 -Wdeprecated-copy warnings	2019-07-15 12:11:31 +02:00
qmakevfs.cpp	…
qmakevfs.h	…
registry.cpp	…
registry_p.h	…