1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index 941b014588..b2fde7a0c6 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -344,10 +344,14 @@ QPlatformWindow *QWindowsIntegration::createPlatformWindow(QWindow *window) cons
 
     if (requested.flags != obtained.flags)
         window->setFlags(obtained.flags);
-    // Trigger geometry/screen change signals of QWindow.
+    // Trigger geometry change (unless it has a special state in which case setWindowState()
+    // will send the message) and screen change signals of QWindow.
     if ((obtained.flags & Qt::Desktop) != Qt::Desktop) {
-        if (requested.geometry != obtained.geometry)
+        const Qt::WindowState state = window->windowState();
+        if (state != Qt::WindowMaximized && state != Qt::WindowFullScreen
+            && 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());