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
..
image	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-29 16:37:38 +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-29 16:37:38 +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