Liang Qi 4fe2fbcf82 Merge remote-tracking branch 'origin/5.6' into 5.7 ... This also reverts commit 018e670a26. The change was introduced in 5.6. After the refactoring, 14960f52, in 5.7 branch and a merge, it is not needed any more. Conflicts: .qmake.conf src/corelib/io/qstandardpaths_mac.mm src/corelib/tools/qsharedpointer_impl.h tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4		2016-02-18 20:50:35 +01:00
..
baseline	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
images	Crash fix: reject certain malformed bmp images	2016-02-05 04:14:35 +00: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 5.7	2016-02-18 20:50:35 +01:00