Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b		2014-11-24 13:39:13 +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	Send events when platform surfaces are created/about to be destroyed	2014-11-17 10:38:22 +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