From e96d16d2b0c352996e0aefeaa8b40c7aed0e0ed8 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 25 Nov 2017 10:15:32 +0100 Subject: [PATCH] ivi: Try the ivi-shell as shell integration as well When using the IviApplication in a compositor and launching a Qt Client it will fail to initialize a shell. This is because QtWaylandClient::QWaylandIntegration::initializeShellIntegration will only try some shells by default. Add the ivi-application to make it work out of the box. Add it last to have XDG and WL shell take preference and avoid loading the libivi-shell.so. Change-Id: I5c97c65d81434cba59cf9cb5bbe4b6fd8ccf4757 Reviewed-by: Johan Helsing Reviewed-by: Paul Olav Tvete --- src/plugins/platforms/wayland/qwaylandintegration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 34845c63922..f0182218fd3 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp @@ -397,7 +397,7 @@ void QWaylandIntegration::initializeShellIntegration() "please specify the shell using QT_WAYLAND_SHELL_INTEGRATION instead"; preferredShells << QLatin1String("xdg-shell-v5"); } - preferredShells << QLatin1String("wl-shell"); + preferredShells << QLatin1String("wl-shell") << QLatin1String("ivi-shell"); } Q_FOREACH (QString preferredShell, preferredShells) {