Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	src/gui/kernel/qplatformintegration.cpp
	src/gui/kernel/qplatformintegration.h
	src/plugins/platforms/wasm/qwasmintegration.cpp
	src/plugins/platforms/xcb/qxcbconnection_screens.cpp

Change-Id: I15063d42e9a1e226d9d2d2d372f75141b84c5c1b

1 files changed, 7 insertions, 5 deletions

diff --git a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
index 4bafe83156..9ba71ada37 100644
--- a/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_screens.cpp
@@ -44,6 +44,8 @@
 #include <QtCore/QString>
 #include <QtCore/QList>
 
+#include <qpa/qwindowsysteminterface.h>
+
 #include <xcb/xinerama.h>
 
 void QXcbConnection::xrandrSelectEvents()
@@ -211,7 +213,7 @@ void QXcbConnection::updateScreen(QXcbScreen *screen, const xcb_randr_output_cha
                 m_screens.swapItemsAt(0, idx);
             }
             screen->virtualDesktop()->setPrimaryScreen(screen);
-            QXcbIntegration::instance()->setPrimaryScreen(screen);
+            QWindowSystemInterface::handlePrimaryScreenChanged(screen);
         }
     }
 }
@@ -234,7 +236,7 @@ QXcbScreen *QXcbConnection::createScreen(QXcbVirtualDesktop *virtualDesktop,
         m_screens.append(screen);
     }
     virtualDesktop->addScreen(screen);
-    QXcbIntegration::instance()->screenAdded(screen, screen->isPrimary());
+    QWindowSystemInterface::handleScreenAdded(screen, screen->isPrimary());
 
     return screen;
 }
@@ -261,10 +263,10 @@ void QXcbConnection::destroyScreen(QXcbScreen *screen)
             const int idx = m_screens.indexOf(newPrimary);
             if (idx > 0)
                 m_screens.swapItemsAt(0, idx);
-            QXcbIntegration::instance()->setPrimaryScreen(newPrimary);
+            QWindowSystemInterface::handlePrimaryScreenChanged(newPrimary);
         }
 
-        QXcbIntegration::instance()->destroyScreen(screen);
+        QWindowSystemInterface::handleScreenRemoved(screen);
     }
 }
 
@@ -406,7 +408,7 @@ void QXcbConnection::initializeScreens()
         // Push the screens to QGuiApplication
         for (QXcbScreen *screen : qAsConst(m_screens)) {
             qCDebug(lcQpaScreen) << "adding" << screen << "(Primary:" << screen->isPrimary() << ")";
-            QXcbIntegration::instance()->screenAdded(screen, screen->isPrimary());
+            QWindowSystemInterface::handleScreenAdded(screen, screen->isPrimary());
         }
 
         qCDebug(lcQpaScreen) << "primary output is" << qAsConst(m_screens).first()->name();