Liang Qi ef37ab9970 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: .qmake.conf src/gui/painting/qdrawhelper.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/android/qandroidinputcontext.cpp src/widgets/styles/qstylesheetstyle.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: Ia7daad21f077ea889898f17734ec46303e71fe6b		2019-06-25 13:04:27 +02:00
..
image	Merge remote-tracking branch 'origin/5.12' into dev	2019-06-25 13:04:27 +02:00
itemmodels	Fix compilation with Qt 6	2019-05-06 20:04:45 +00:00
kernel	Fix warnings & deprs in tst_qcoreapplication and tst_qguiapplication	2019-06-05 13:01:13 +02:00
math3d	Use qRadiansToDegrees() and qDegreesToRadians() more widely	2017-07-05 10:15:34 +00:00
painting	Remove QLatin1Literal usages	2019-06-10 16:50:31 +00:00
qopengl	Fix OpenGL ES2 build on Linux	2019-02-15 12:58:12 +00:00
qopenglconfig	Deprecate conversion functions between QList and QSet	2019-05-07 14:15:44 +00:00
qvulkan	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
rhi	Introduce the Qt graphics abstraction as private QtGui helpers	2019-06-13 10:13:45 +02:00
text	Port from QAtomic::load() to loadRelaxed()	2019-06-20 20:48:59 +02:00
util	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-03 10:44:24 +02:00
gui.pro	Introduce the Qt graphics abstraction as private QtGui helpers	2019-06-13 10:13:45 +02:00