qt5base-lts/tests/auto/gui/image
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
..
qicoimageformat Updated license headers 2016-01-21 18:55:18 +00:00
qicon QIcon::fromTheme(): add support for absolute paths. 2016-02-15 13:53:54 +00:00
qimage Updated license headers 2016-01-21 18:55:18 +00:00
qimageiohandler Updated license headers 2016-01-21 18:55:18 +00:00
qimagereader Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qimagewriter Updated license headers 2016-01-21 18:55:18 +00:00
qmovie Updated license headers 2016-01-21 18:55:18 +00:00
qpicture Updated license headers 2016-01-21 18:55:18 +00:00
qpixmap Updated license headers 2016-01-21 18:55:18 +00:00
qpixmapcache Updated license headers 2016-01-21 18:55:18 +00:00
image.pro Check for network module when building according auto tests 2013-02-19 19:20:53 +01:00