Oswald Buddenhagen 189dc655bb Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/image/qimage.cpp src/gui/image/qppmhandler.cpp src/gui/kernel/qguiapplication.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765		2014-09-29 14:08:49 +02:00
..
qicoimageformat	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qicon	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qimage	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00
qimageiohandler	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qimagereader	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00
qimagewriter	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qmovie	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qpicture	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qpixmap	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qpixmapcache	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
image.pro	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00