summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2019-03-29 09:42:02 +0100
committerLiang Qi <liang.qi@qt.io>2019-03-29 08:54:22 +0000
commit59fcde2e722ea6f7342ac9bf956f5f0b2911e7fd (patch)
tree5c994f5335d72900a680adb90d0978d3076efc3c /src
parenta93223d8f27b883581624649fbc6d73a9a0db62f (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/client/qwaylanddisplay.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 491b66e15..5b1b9bffb 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/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;
}
}