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
..
image	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
itemmodels
kernel	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-29 16:37:38 +01:00
math3d
painting	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
qopengl	Support Alpha8 and Grayscale8 natively in the OpenGL paint engine	2014-10-27 11:54:39 +01:00
text	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
util	Observe QLocale::RejectGroupSeparator in QInt/DoubleValidator.	2014-11-20 16:38:23 +01:00
gui.pro