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

Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e

1 files changed, 17 insertions, 2 deletions

diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 0dde679a7a..eabebffdab 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -319,6 +319,12 @@ void QXcbWindow::create()
     // currently no way to implement it for frame-exclusive geometries.
     QRect rect = window()->geometry();
     QPlatformWindow::setGeometry(rect);
+    QXcbScreen *currentScreen = xcbScreen();
+    QPlatformScreen *newScreen = screenForGeometry(rect);
+
+    if (newScreen != currentScreen)
+        QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->screen());
+
     const int dpr = int(devicePixelRatio());
 
     QSize minimumSize = window()->minimumSize();
@@ -583,9 +589,18 @@ void QXcbWindow::setGeometry(const QRect &rect)
 
     propagateSizeHints();
 
-    const QRect xRect = mapToNative(rect, int(devicePixelRatio()));
+    QXcbScreen *currentScreen = xcbScreen();
+    QPlatformScreen *newScreen = screenForGeometry(rect);
+    if (!newScreen)
+        newScreen = currentScreen;
+
+    const QRect xRect = mapToNative(rect, int(newScreen->devicePixelRatio()));
     const QRect wmGeometry = windowToWmGeometry(xRect);
 
+
+    if (newScreen != currentScreen)
+        QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->screen());
+
     if (qt_window_private(window())->positionAutomatic) {
         const quint32 mask = XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT;
         const qint32 values[] = {
@@ -1919,7 +1934,7 @@ void QXcbWindow::handleConfigureNotifyEvent(const xcb_configure_notify_event_t *
     if (newScreen != screen()) {
         if (newScreen)
             QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->screen());
-        int newDpr = devicePixelRatio();
+        int newDpr = newScreen->devicePixelRatio();
         if (newDpr != dpr) {
             QRect newRect = mapGeometryFromNative(nativeRect, newDpr);
             QPlatformWindow::setGeometry(newRect);