Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069

1 files changed, 7 insertions, 3 deletions

diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 274366d4fe..00229a7540 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -1365,9 +1365,10 @@ void QWindowsWindow::handleResized(int wParam)
         handleGeometryChange();
         break;
     case SIZE_RESTORED:
-        bool fullScreen = isFullScreen_sys();
-        if ((m_windowState != Qt::WindowNoState) || fullScreen)
-            handleWindowStateChange(fullScreen ? Qt::WindowFullScreen : Qt::WindowNoState);
+        if (isFullScreen_sys())
+            handleWindowStateChange(Qt::WindowFullScreen);
+        else if (m_windowState != Qt::WindowNoState && !testFlag(MaximizeToFullScreen))
+            handleWindowStateChange(Qt::WindowNoState);
         handleGeometryChange();
         break;
     }
@@ -1623,8 +1624,11 @@ void QWindowsWindow::setWindowState_sys(Qt::WindowState newState)
     if ((oldState == Qt::WindowMaximized) != (newState == Qt::WindowMaximized)) {
         if (visible && !(newState == Qt::WindowMinimized)) {
             setFlag(WithinMaximize);
+            if (newState == Qt::WindowFullScreen)
+                setFlag(MaximizeToFullScreen);
             ShowWindow(m_data.hwnd, (newState == Qt::WindowMaximized) ? SW_MAXIMIZE : SW_SHOWNOACTIVATE);
             clearFlag(WithinMaximize);
+            clearFlag(MaximizeToFullScreen);
         }
     }