diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-06 16:18:37 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-06 16:18:37 +0200 |
commit | 88a30a8fe059f758190b73ea6c2c13bb70df07a6 (patch) | |
tree | 8879d67e687b7a90e12a84df4363fcc537752925 | |
parent | 6d927bc43b4b0bdbf38521c1cad81d997980ae5b (diff) | |
parent | c3b6c4d442c8187e43601c548bc58ce3e4fe21f3 (diff) | |
download | qtwayland-88a30a8fe059f758190b73ea6c2c13bb70df07a6.tar.gz |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I06b86b413984c07f6be98120450bc859dab271c1
-rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.cpp | 5 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 2 | ||||
-rw-r--r-- | src/compositor/extensions/qwaylandxdgshellv6integration.cpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp index c9cc5a13..17c56cfd 100644 --- a/src/compositor/compositor_api/qwaylandoutput.cpp +++ b/src/compositor/compositor_api/qwaylandoutput.cpp @@ -944,7 +944,10 @@ void QWaylandOutput::surfaceLeave(QWaylandSurface *surface) { if (!surface || !surface->client()) return; - QWaylandSurfacePrivate::get(surface)->send_leave(resourceForClient(surface->client())); + + auto *clientResource = resourceForClient(surface->client()); + if (clientResource) + QWaylandSurfacePrivate::get(surface)->send_leave(clientResource); } /*! diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 7f0685fc..fd9b1b80 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -288,7 +288,7 @@ public: m_sgTex->bind(); } } else { - QQuickWindow::CreateTextureOptions opt = QQuickWindow::TextureOwnsGLTexture; + QQuickWindow::CreateTextureOptions opt; QWaylandQuickSurface *surface = qobject_cast<QWaylandQuickSurface *>(surfaceItem->surface()); if (surface && surface->useTextureAlpha()) { opt |= QQuickWindow::TextureHasAlphaChannel; diff --git a/src/compositor/extensions/qwaylandxdgshellv6integration.cpp b/src/compositor/extensions/qwaylandxdgshellv6integration.cpp index a37ee2a3..61a9092a 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6integration.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv6integration.cpp @@ -109,7 +109,7 @@ bool XdgToplevelV6Integration::mouseReleaseEvent(QMouseEvent *event) { Q_UNUSED(event); - if (grabberState == GrabberState::Move) { + if (grabberState != GrabberState::Default) { grabberState = GrabberState::Default; return true; } |