Simon Hausmann e281537f20 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d		2014-12-18 12:12:58 +01: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-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	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