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
..
image	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-02 01:00:26 +02:00
itemmodels	Fix use of deprecated ItemDataRoles Background/TextColorRole	2018-11-05 21:58:37 +00:00
kernel	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-02-28 01:00:15 +01:00
math3d	Use qRadiansToDegrees() and qDegreesToRadians() more widely	2017-07-05 10:15:34 +00:00
painting	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-02 01:00:26 +02:00
qopengl	Fix OpenGL ES2 build on Linux	2019-02-15 12:58:12 +00:00
qopenglconfig	Fix tst_QOpenGlConfig for platforms with builtin test data	2017-06-19 07:05:59 +00:00
qvulkan	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
text	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-09 13:06:11 +00:00
util	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-03 10:44:24 +02:00
gui.pro	winrt: Skip/blacklist failing opengl tests	2018-05-28 08:36:55 +00:00