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

Conflicts:
	src/widgets/widgets/qpushbutton.cpp

Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81

1 files changed, 10 insertions, 4 deletions

diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 121fdaeabd..ea0ee52669 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -1767,10 +1767,9 @@ bool QWindowsWindow::isFullScreen_sys() const
     const QWindow *w = window();
     if (!w->isTopLevel())
         return false;
-    const QScreen *screen = w->screen();
-    if (!screen)
-        screen = QGuiApplication::primaryScreen();
-    return screen && geometry_sys() == QHighDpi::toNativePixels(screen->geometry(), w);
+    QRect geometry = geometry_sys();
+    QPlatformScreen *screen = screenForGeometry(geometry);
+    return screen && geometry == QHighDpi::toNativePixels(screen->geometry(), screen);
 }
 
 /*!
@@ -1842,6 +1841,13 @@ void QWindowsWindow::setWindowState_sys(Qt::WindowState newState)
                 newStyle |= WS_VISIBLE;
             setStyle(newStyle);
 
+            const QScreen *screen = window()->screen();
+            if (!screen)
+                screen = QGuiApplication::primaryScreen();
+            // That area of the virtual desktop might not be covered by a screen anymore.
+            if (!screen->geometry().intersects(m_savedFrameGeometry))
+                m_savedFrameGeometry.moveTo(screen->geometry().topLeft());
+
             UINT swpf = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE;
             if (!m_savedFrameGeometry.isValid())
                 swpf |= SWP_NOSIZE | SWP_NOMOVE;