Qt Forward Merge Bot 77d126ccb5 Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: configure.pri Also required s/solid\.color/solidColor/ in a couple of places in: src/gui/painting/qpaintengine_raster.cpp Change-Id: I29937f63e9779deb6dac7ae77e2948d06ebc0319		2019-07-12 12:23:29 +02:00
..
ioutils.cpp	Recognize UNC paths as absolute (i.e. not relative)	2019-02-13 14:15:10 +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	Add QDebug streaming operator for ProString	2019-06-24 17:40:07 +02:00
proitems.h	Add QDebug streaming operator for ProString	2019-06-24 17:40:07 +02:00
qmake_global.h	…
qmakebuiltins.cpp	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00
qmakeevaluator.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-07-12 12:23:29 +02: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	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.cpp	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00
registry_p.h	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00