Qt Forward Merge Bot e56d3b03ed Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: src/corelib/tools/qlocale_data_p.h (Regenerated by running the scripts in util/local_database/) src/gui/opengl/qopengltextureuploader.cpp Done-With: Edward Welbourne <edward.welbourne@qt.io> Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io> Change-Id: I12df7f066ed0a25eb109f61c4b8d8dea63b683e2		2019-05-09 13:06:11 +00:00
..
mac	qmake: Remove dead code	2019-04-05 07:48:34 +00:00
unix	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-06 01:00:08 +02:00
win32	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-24 01:00:13 +02:00
makefile.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-06 01:00:08 +02:00
makefile.h	Make the Makefile a dependency of default targets for nmake	2019-02-04 08:10:25 +00:00
makefiledeps.cpp	qmake: Distinguish local header files by directory and name	2019-05-07 08:41:09 +00:00
makefiledeps.h	qmake: replace a uint:1 with a bool	2016-08-15 22:16:09 +00:00
metamakefile.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
metamakefile.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
projectgenerator.cpp	Enable deprecation warnings by default	2019-02-02 02:31:05 +00:00
projectgenerator.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
xmloutput.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
xmloutput.h	Updated license headers	2016-01-21 18:55:18 +00:00