Liang Qi bc07958f92 Merge remote-tracking branch 'origin/5.11' into 5.12 ... Conflicts: .qmake.conf qmake/Makefile.unix src/gui/text/qtextdocument.cpp src/gui/text/qtextdocument.h Change-Id: Iba26da0ecbf2aa4ff4b956391cfb373f977f88c9		2018-11-09 10:34:33 +01:00
..
ioutils.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +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: make yet more use of ProString::toQStringRef()	2017-08-26 12:11:35 +00:00
proitems.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
qmake_global.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
qmakeevaluator.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
qmakeevaluator.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
qmakeevaluator_p.h	qmake: make argument validation of built-ins data driven	2018-06-27 17:23:57 +00:00
qmakeglobals.cpp	qmake: skip empty parts when splitting strings in some more places	2018-06-01 09:09:35 +00:00
qmakeglobals.h	qmake: updates to the parsing code of external properties	2018-03-29 18:15:29 +00:00
qmakeparser.cpp	qmake: fix file id mapping lifetime management	2018-08-24 12:16:37 +00:00
qmakeparser.h	qmake: fix file id mapping lifetime management	2018-08-24 12:16:37 +00:00
qmakevfs.cpp	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-11-09 10:34:33 +01:00
qmakevfs.h	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-11-09 10:34:33 +01:00