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	QRegExp include cleanup	2019-04-19 21:21:17 +00:00
ioutils.h	qmake: minor fixups to ioutils for building in qt creator context	2018-03-29 18:15:35 +00:00
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	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	qmake: use std names on a linked list	2019-05-13 16:39:22 +00:00
qmakeevaluator_p.h	QRegExp include cleanup	2019-04-19 21:21:17 +00:00
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
qmakeglobals.cpp	QRegExp include cleanup	2019-04-19 21:21:17 +00:00
qmakeglobals.h	qmake: updates to the parsing code of external properties	2018-03-29 18:15:29 +00:00
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	Fix crash in qmake parsing	2018-11-29 07:46:02 +00:00
qmakevfs.h	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-11-09 10:34:33 +01:00
registry_p.h	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00
registry.cpp	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00