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
..
dialogs	Qt Widgets: Make tests pass on High DPI screens and scaling	2019-05-29 12:52:51 +02:00
effects	qWaitFor: Prevent being stuck in QCoreApplication::processEvents	2019-01-09 18:10:54 +00:00
graphicsview	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
itemviews	Qt Widgets: Make tests pass on High DPI screens and scaling	2019-05-29 12:52:51 +02:00
kernel	Merge remote-tracking branch 'origin/5.12' into dev	2019-06-25 13:04:27 +02:00
styles	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-16 09:34:50 +02:00
util	Brush up tst_QCompleter	2019-06-07 12:34:47 +02:00
widgets	Merge remote-tracking branch 'origin/5.12' into dev	2019-06-25 13:04:27 +02:00
widgets.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00