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

1 files changed, 16 insertions, 0 deletions

diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
index 142362a065..351f94be2b 100644
--- a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
+++ b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
@@ -39,6 +39,7 @@
 #include "qwindowsdirect2dwindow.h"
 
 #include "qwindowscontext.h"
+#include "qwindowsguieventdispatcher.h"
 
 #include <qplatformdefs.h>
 #include <QtCore/QCoreApplication>
@@ -47,6 +48,16 @@
 
 QT_BEGIN_NAMESPACE
 
+class QWindowsDirect2DEventDispatcher : public QWindowsGuiEventDispatcher
+{
+public:
+    QWindowsDirect2DEventDispatcher(QObject *parent = 0)
+        : QWindowsGuiEventDispatcher(parent)
+    {
+        uninstallMessageHook(); // ### Workaround for QTBUG-42428
+    }
+};
+
 class QWindowsDirect2DIntegrationPrivate
 {
 public:
@@ -237,6 +248,11 @@ QPlatformBackingStore *QWindowsDirect2DIntegration::createPlatformBackingStore(Q
     return new QWindowsDirect2DBackingStore(window);
 }
 
+QAbstractEventDispatcher *QWindowsDirect2DIntegration::createEventDispatcher() const
+{
+    return new QWindowsDirect2DEventDispatcher;
+}
+
 QWindowsDirect2DContext *QWindowsDirect2DIntegration::direct2DContext() const
 {
     return &d->m_d2dContext;