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
..
access	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-18 12:12:58 +01:00
bearer	Change bugreports.qt-project.org -> bugreports.qt.io	2014-12-18 09:46:09 +01:00
kernel	Android: XFAIL a few tests in QDnsLookup	2015-01-12 13:09:57 +01:00
socket	Fix QUdpSocket's emission of readyRead()	2015-01-22 04:44:10 +01:00
ssl	Merge remote-tracking branch 'origin/5.4' into dev	2015-02-10 09:42:25 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00