Liang Qi 6b8f422c5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03		2016-08-13 01:05:02 +02:00
..
images	ICO image format: fix regression in writing when size >= 256	2016-05-13 04:37:15 +00:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qimagewriter.pro	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qimagewriter.qrc	Android: Fix qimagewriter test.	2015-01-08 10:02:23 +01:00
tst_qimagewriter.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00