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
..
qicoimageformat	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-23 21:09:46 +02:00
qicon	Introduce QIcon::fallbackSearchPaths()	2018-01-15 10:12:22 +00:00
qiconhighdpi	qt_findAtNxFile(): account for .9 (9-patch image) extensions	2017-06-24 21:24:53 +00:00
qimage	Migrate Windows system libs to external dependencies	2019-05-08 08:30:02 +00:00
qimageiohandler	Updated license headers	2016-01-21 18:55:18 +00:00
qimagereader	Merge remote-tracking branch 'origin/5.12' into dev	2019-06-25 13:04:27 +02:00
qimagewriter	Add Grayscale16 Image Format	2018-12-12 22:26:49 +00:00
qmovie	Fix a crash when QMovie::speed is set to 0	2018-01-24 10:13:00 +00:00
qpicture	tst_qpicture: Remove dependency on widgets	2018-05-24 10:35:43 +00:00
qpixmap	Migrate Windows system libs to external dependencies	2019-05-08 08:30:02 +00:00
qpixmapcache	QPixmapCache: make sure to not overflow cache limit	2018-04-10 18:45:27 +00:00
image.pro	Implement support for Scale directory key according to Icon Theme spec	2017-02-01 13:58:01 +00:00