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
..
android
bic/data	Add binary compatibility files for 5.12 for QtBase	2018-12-21 19:42:57 +00:00
cmake	Export modules' enabled/disabled features to cmake	2018-09-28 13:10:28 +00:00
concurrent
corelib	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-09 13:06:11 +00:00
dbus	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-02-19 01:00:08 +01:00
gui	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-09 13:06:11 +00:00
guiapplauncher
installed_cmake
network	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-10 01:00:08 +02:00
opengl	qWaitFor: Prevent being stuck in QCoreApplication::processEvents	2019-01-09 18:10:54 +00:00
other	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-09 13:06:11 +00:00
printsupport	tst_QPrinter: stabilize qprinter test	2019-01-20 13:39:54 +00:00
shared	Read font selection flags and use them when querying for metrics	2018-11-30 16:15:03 +00:00
sql	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-02-21 01:00:08 +01:00
testlib	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-09 13:06:11 +00:00
tools	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-02 01:00:26 +02:00
widgets	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-02 09:39:31 +02:00
xml
auto.pro
network-settings.h	Extend the default retry times of QtNetworkSettings::verifyConnection	2019-01-23 15:28:33 +00:00
testserver.pri	Disable Docker-based test servers on macOS temporarily	2019-02-06 22:04:54 +00:00