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
..
baseline	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
images	Generalize image file name @2x suffix handling to higher scale factors	2019-06-14 13:08:56 +02:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
android_testdata.qrc	Android: Fix QImageReader test	2015-01-16 09:27:15 +01:00
qimagereader.pro	tst_qimagereader: Make sure to include all image resources in test	2018-04-20 15:05:01 +00:00
tst_qimagereader.cpp	Merge remote-tracking branch 'origin/5.12' into dev	2019-06-25 13:04:27 +02:00