From d26abdb7a1a0265d09683c0259e1b5ea9a866b09 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 24 May 2018 11:46:11 +0200 Subject: Client: Add shell integration for xdg-shell stable [ChangeLog][QPA plugin] Added support for xdg-shell stable. Mostly a copy of xdg_shell unstable v6 with prefixes and suffixes removed. Otherwise, this is what changed: - The global is now named "xdg_wm_base", since "xdg_shell" was taken by xdg-shell <= v5. - Anchors and gravities are not bitfields anymore. Task-number: QTBUG-66783 Change-Id: I8ca881aae52cc07b22ff5e26df13a9a1566f58f4 Reviewed-by: Paul Olav Tvete --- src/client/qwaylandintegration.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/client/qwaylandintegration.cpp') diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 6ab5f0f20..f05d146c3 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -388,6 +388,7 @@ void QWaylandIntegration::initializeShellIntegration() if (!targetKey.isEmpty()) { preferredShells << targetKey; } else { + preferredShells << QLatin1String("xdg-shell"); preferredShells << QLatin1String("xdg-shell-v6"); QString useXdgShell = QString::fromLocal8Bit(qgetenv("QT_WAYLAND_USE_XDG_SHELL")); if (!useXdgShell.isEmpty() && useXdgShell != QLatin1String("0")) { -- cgit v1.2.3