Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af		2015-01-21 11:10:14 +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	2015-01-21 11:10:14 +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	2015-01-21 11:10:14 +01:00
qimagewriter	Android: Fix qimagewriter test.	2015-01-08 10:02:23 +01: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	Android: Fix qpixmap test.	2015-01-08 10:10:50 +01: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