Liang Qi bd9959bde2 Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: .qmake.conf src/gui/painting/qdrawhelper.cpp src/network/ssl/qsslsocket_openssl.cpp src/widgets/styles/qstylesheetstyle.cpp Change-Id: Ibe1cd40f46a823c9e5edbe0a3cd16be1e1686b17		2019-06-20 07:50:44 +02:00
..
baseline	…
images	Generalize image file name @2x suffix handling to higher scale factors	2019-06-14 13:08:56 +02:00
.gitignore	…
android_testdata.qrc	…
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 5.13	2019-06-20 07:50:44 +02:00