Frederik Gladhorn fc35f71434 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro src/gui/image/qimage_conversions.cpp src/gui/opengl/qopenglextensions_p.h src/gui/text/qtextengine.cpp src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/eglfs/qeglfshooks_stub.cpp src/plugins/platforms/eglfs/qeglfsscreen.cpp src/plugins/platforms/eglfs/qeglfswindow.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp src/plugins/platforms/windows/qwindowsnativeinterface.cpp src/plugins/platforms/windows/qwindowsscreen.cpp src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/windows/qwindowswindow.h src/plugins/platforms/xcb/qxcbdrag.h src/widgets/itemviews/qabstractitemview.cpp src/widgets/kernel/qwidget.cpp src/widgets/util/qsystemtrayicon_p.h tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp conflicts. Change-Id: I937232c30523d5121c195d947d92aec6f129b03e		2015-02-10 09:42:25 +01:00
..
image	Merge remote-tracking branch 'origin/5.4' into dev	2015-02-10 09:42:25 +01:00
itemmodels	Don't crash with invalid QModelIndex or when QTreeWidgetItem is NULL in mimeData()	2015-02-06 09:43:38 +00:00
kernel	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-29 16:37:38 +01:00
math3d	[QQuaternion] Introduce to/from rotation matrix conversion routines	2015-02-06 16:14:38 +00:00
painting	Avoid creating a QPixmap on QBrush comparisons	2015-02-04 22:10:17 +00:00
qopengl	Support Alpha8 and Grayscale8 natively in the OpenGL paint engine	2014-10-27 11:54:39 +01:00
qopenglconfig	Add qopenglconfig test.	2015-02-02 23:05:41 +00:00
text	Deprecate QFont:: rawMode()/setRawMode()	2015-01-23 14:06:03 +01:00
util	Observe QLocale::RejectGroupSeparator in QInt/DoubleValidator.	2014-11-20 16:38:23 +01:00
gui.pro	Add qopenglconfig test.	2015-02-02 23:05:41 +00:00