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
..
doc	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-09 13:06:11 +00:00
generators	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-09 13:06:11 +00:00
library	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-02-15 01:00:51 +01:00
cachekeys.h
main.cpp	Let QINSTALL copy hidden files when installing directories	2019-04-09 08:16:25 +00:00
Makefile.unix	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00
Makefile.unix.macos
Makefile.unix.mingw	fix "make clean" of qmake in a builddir with spaces on mingw	2017-12-14 18:06:31 +00:00
Makefile.unix.unix	Move the readlink(2) wrapper to qcore_unix.cpp	2017-07-08 02:18:16 +00:00
Makefile.unix.win32	qmake: add $$read_registry() function	2019-01-05 20:33:07 +00:00
Makefile.win32	qmake: Optimize for speed instead of size	2019-02-18 23:03:48 +00:00
meta.cpp	qmake: Remove dead code	2019-04-05 07:48:34 +00:00
meta.h	qmake: Remove dead code	2019-04-05 07:48:34 +00:00
option.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
option.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
project.cpp	qmake: make argument validation of built-ins data driven	2018-06-27 17:23:57 +00:00
project.h
property.cpp	Compile with QT_STRICT_ITERATORS defined	2018-11-26 07:04:24 +00:00
property.h
qmake_pch.h	qmake: move QT_BEGIN_NAMESPACE to correct place	2018-12-19 19:21:35 +00:00
qmake-aux.pro
qmake.pro	Add cmdline feature to qmake	2019-02-18 07:12:14 +00:00