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
..
image	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-18 12:12:58 +01:00
itemmodels	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
kernel	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-18 12:12:58 +01:00
math3d	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
painting	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02: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	2014-12-18 12:12:58 +01:00
util	Observe QLocale::RejectGroupSeparator in QInt/DoubleValidator.	2014-11-20 16:38:23 +01:00
gui.pro	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00