Simon Hausmann 015002fec9 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: doc/global/template/style/online.css mkspecs/android-g++/qmake.conf Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61		2014-12-10 07:58:06 +01:00
..
image	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +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-10 07:58:06 +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-10-27 13:00:36 +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