diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2017-11-25 10:15:32 +0100 |
|---|---|---|
| committer | Holger Freyther <holger+qt@freyther.de> | 2017-12-01 12:25:36 +0000 |
| commit | c136f26ccc79957652be7a1e34f85ec9ca6fe9ba (patch) | |
| tree | 77ca697e3a4f4479834620cfb2f2e4dae052841d /src/client/qwaylandintegration.cpp | |
| parent | aceef1e96cb2b2e59a44604fb39981d9592f6e7b (diff) | |
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 <johan.helsing@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index 34845c639..f0182218f 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/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) { |