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
..
syslocaleapp	Add cmdline feature to qmake	2019-02-18 07:12:14 +00:00
test	Make tests compile for Android	2018-06-25 08:01:19 +00:00
.gitignore
BLACKLIST	Blacklist two tests on macOS that a planned CI change shall break	2018-08-24 17:30:01 +00:00
qlocale.pro	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
tst_qlocale.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-09 13:06:11 +00:00