qt5base-lts/tests/auto/gui/image
Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
	mkspecs/android-g++/qmake.conf
	qmake/generators/unix/unixmake2.cpp
	src/gui/image/qimage_conversions.cpp

Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
2015-03-31 10:03:31 +02:00
..
qicoimageformat Update copyright headers 2015-02-11 06:49:51 +00:00
qicon Update copyright headers 2015-02-11 06:49:51 +00:00
qimage Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-31 10:03:31 +02:00
qimageiohandler Update copyright headers 2015-02-11 06:49:51 +00:00
qimagereader MSVC: Remove use of -Zm argument 2015-02-13 21:23:19 +00:00
qimagewriter MSVC: Remove use of -Zm argument 2015-02-13 21:23:19 +00:00
qmovie Update copyright headers 2015-02-11 06:49:51 +00:00
qpicture Update copyright headers 2015-02-11 06:49:51 +00:00
qpixmap Add tests for detach on setDevicePixelRatio() 2015-03-24 11:22:36 +00:00
qpixmapcache Update copyright headers 2015-02-11 06:49:51 +00:00
image.pro Check for network module when building according auto tests 2013-02-19 19:20:53 +01:00