1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build - screen maintenance functions moved to QWSI

Browse Source 
This is an ammendment to 01e1df90a7debd333314720fdd5cf6cd9964d796 in
qtbase.

Task-number: QTBUG-74816
Change-Id: I493ff0f64f765683d2398c32626ada28d7f202b5
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Jesus Fernandez 2019-03-29 09:42:02 +01:00 committed by Liang Qi
parent 3d147d01e3
commit 544d5e1221
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

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