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
..
qicoimageformat	Android: Fix qicoimageformat test.	2014-12-22 08:34:05 +01:00
qicon	Fixed icons lookup in QIcon::fromTheme	2015-02-02 23:28:19 +00:00
qimage	Merge remote-tracking branch 'origin/5.4' into dev	2015-02-10 09:42:25 +01:00
qimageiohandler	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qimagereader	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
qimagewriter	Android: Fix qimagewriter test.	2015-01-08 10:02:23 +01:00
qmovie	Android: Fix qmovie test.	2014-12-22 08:33:17 +01:00
qpicture	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qpixmap	Make it more obvious that Q_WS_ is dead code, and should perhaps be ported	2015-02-03 11:49:14 +00:00
qpixmapcache	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
image.pro	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00