Qt Forward Merge Bot 6893919b0c Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: src/gui/kernel/qplatformintegration.cpp src/gui/kernel/qplatformintegration.h src/plugins/platforms/wasm/qwasmintegration.cpp src/plugins/platforms/xcb/qxcbconnection_screens.cpp Change-Id: I15063d42e9a1e226d9d2d2d372f75141b84c5c1b		2019-03-20 14:09:30 +01:00
..
image	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-03-20 14:09:30 +01: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	Add faster path for scaling QRegion with multiple regions	2019-02-13 05:12:05 +00: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-02-15 01:00:51 +01:00
util	QTextureFileReader: add support for astc format files	2019-02-27 13:00:56 +00:00
gui.pro	winrt: Skip/blacklist failing opengl tests	2018-05-28 08:36:55 +00:00