From 544d5e1221b043571d1b7f2f039e4da49fd68ace Mon Sep 17 00:00:00 2001
From: Jesus Fernandez <jesus.fernandez@qt.io>
Date: Fri, 29 Mar 2019 09:42:02 +0100
Subject: [PATCH] Fix build - screen maintenance functions moved to QWSI

This is an ammendment to 01e1df90a7debd333314720fdd5cf6cd9964d796 in
qtbase.

Task-number: QTBUG-74816
Change-Id: I493ff0f64f765683d2398c32626ada28d7f202b5
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 src/plugins/platforms/wayland/qwaylanddisplay.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index 491b66e153a..5b1b9bffb76 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -70,6 +70,7 @@
 #include <QtWaylandClient/private/qwayland-text-input-unstable-v2.h>
 
 #include <QtCore/QAbstractEventDispatcher>
+#include <QtGui/qpa/qwindowsysteminterface.h>
 #include <QtGui/private/qguiapplication_p.h>
 
 #include <QtCore/QDebug>
@@ -153,7 +154,7 @@ QWaylandDisplay::~QWaylandDisplay(void)
     mInputDevices.clear();
 
     foreach (QWaylandScreen *screen, mScreens) {
-        mWaylandIntegration->destroyScreen(screen);
+        QWindowSystemInterface::handleScreenRemoved(screen);
     }
     mScreens.clear();
 
@@ -244,7 +245,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
         mScreens.append(screen);
         // We need to get the output events before creating surfaces
         forceRoundTrip();
-        mWaylandIntegration->screenAdded(screen);
+        QWindowSystemInterface::handleScreenAdded(screen);
     } else if (interface == QStringLiteral("wl_compositor")) {
         mCompositorVersion = qMin((int)version, 3);
         mCompositor.init(registry, id, mCompositorVersion);
@@ -300,7 +301,7 @@ void QWaylandDisplay::registry_global_remove(uint32_t id)
                 foreach (QWaylandScreen *screen, mScreens) {
                     if (screen->outputId() == id) {
                         mScreens.removeOne(screen);
-                        mWaylandIntegration->destroyScreen(screen);
+                        QWindowSystemInterface::handleScreenRemoved(screen);
                         break;
                     }
                 }