Frederik Gladhorn aaff94c2df Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79		2014-12-29 16:37:38 +01:00
..
qicoimageformat	Android: Fix qicoimageformat test.	2014-12-22 08:34:05 +01:00
qicon	Android: Fix qicon test.	2014-12-22 08:33:02 +01:00
qimage	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01: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-12-18 12:12:58 +01:00
qimagewriter	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qmovie	Android: Fix qmovie test.	2014-12-22 08:33:17 +01: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