1 files changed, 21 insertions, 13 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index 2f61baa8a1..81525775c6 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -44,7 +44,6 @@
 #  include "qwindowsfontdatabase_ft.h"
 #endif
 #include "qwindowsfontdatabase.h"
-#include "qwindowsguieventdispatcher.h"
 #ifndef QT_NO_CLIPBOARD
 #  include "qwindowsclipboard.h"
 #  ifndef QT_NO_DRAGANDDROP
@@ -67,7 +66,8 @@
 #include <QtGui/private/qhighdpiscaling_p.h>
 #include <QtGui/qpa/qplatforminputcontextfactory_p.h>
 
-#include <QtCore/private/qeventdispatcher_win_p.h>
+#include <QtPlatformSupport/private/qwindowsguieventdispatcher_p.h>
+
 #include <QtCore/QDebug>
 #include <QtCore/QVariant>
 
@@ -291,7 +291,7 @@ bool QWindowsIntegration::hasCapability(QPlatformIntegration::Capability cap) co
     return false;
 }
 
-QWindowsWindowData QWindowsIntegration::createWindowData(QWindow *window) const
+QPlatformWindow *QWindowsIntegration::createPlatformWindow(QWindow *window) const
 {
     QWindowsWindowData requested;
     requested.flags = window->flags();
@@ -310,22 +310,30 @@ QWindowsWindowData QWindowsIntegration::createWindowData(QWindow *window) const
         << "\n    Obtained : " << obtained.geometry << " margins=" << obtained.frame
         << " handle=" << obtained.hwnd << ' ' << obtained.flags << '\n';
 
-    if (obtained.hwnd) {
-        if (requested.flags != obtained.flags)
-            window->setFlags(obtained.flags);
-        // Trigger geometry change signals of QWindow.
-        if ((obtained.flags & Qt::Desktop) != Qt::Desktop && requested.geometry != obtained.geometry)
+    if (Q_UNLIKELY(!obtained.hwnd))
+        return Q_NULLPTR;
+
+    QWindowsWindow *result = createPlatformWindowHelper(window, obtained);
+    Q_ASSERT(result);
+
+    if (requested.flags != obtained.flags)
+        window->setFlags(obtained.flags);
+    // Trigger geometry/screen change signals of QWindow.
+    if ((obtained.flags & Qt::Desktop) != Qt::Desktop) {
+        if (requested.geometry != obtained.geometry)
             QWindowSystemInterface::handleGeometryChange(window, obtained.geometry);
+        QPlatformScreen *screen = result->screenForGeometry(obtained.geometry);
+        if (screen && result->screen() != screen)
+            QWindowSystemInterface::handleWindowScreenChanged(window, screen->screen());
     }
 
-    return obtained;
+    return result;
 }
 
-QPlatformWindow *QWindowsIntegration::createPlatformWindow(QWindow *window) const
+// Overridden to return a QWindowsDirect2DWindow in Direct2D plugin.
+QWindowsWindow *QWindowsIntegration::createPlatformWindowHelper(QWindow *window, const QWindowsWindowData &data) const
 {
-    QWindowsWindowData data = createWindowData(window);
-    return data.hwnd ? new QWindowsWindow(window, data)
-                     : Q_NULLPTR;
+    return new QWindowsWindow(window, data);
 }
 
 #ifndef QT_NO_OPENGL