Liang Qi 4456984da7 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e		2015-10-14 15:45:35 +02:00
..
baseline	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
images	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01: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	MSVC: Remove use of -Zm argument	2015-02-13 21:23:19 +00:00
qimagereader.qrc	Fixed crash in image reader when reading certain BMP files.	2013-02-06 09:59:56 +01:00
tst_qimagereader.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00