diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2018-05-29 15:20:39 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2018-05-29 16:05:29 +0000 |
| commit | 88241667a7c53e1d612f12ee801fe39474222b02 (patch) | |
| tree | e0855055eb7d3a653f94c4959b443dfd9d2a5832 /src/client/qwaylandintegration.cpp | |
| parent | 0e1809d116561a73fbfb5e878efaace26228df84 (diff) | |
Client: Accept prioritized list of shell integrations
[ChangeLog][QPA plugin] QT_WAYLAND_SHELL_INTEGRATION environment variable
now accepts a semicolon-separated list of shell integrations.
Change-Id: I91364f53ea584bfbd9693b5ea58df07226c3e2c6
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: David Edmundson <davidedmundson@kde.org>
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index f05d146c3..a3ae802ff 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -381,12 +381,12 @@ void QWaylandIntegration::initializeShellIntegration() { mShellIntegrationInitialized = true; - QByteArray integrationName = qgetenv("QT_WAYLAND_SHELL_INTEGRATION"); - QString targetKey = QString::fromLocal8Bit(integrationName); + QByteArray integrationNames = qgetenv("QT_WAYLAND_SHELL_INTEGRATION"); + QString targetKeys = QString::fromLocal8Bit(integrationNames); QStringList preferredShells; - if (!targetKey.isEmpty()) { - preferredShells << targetKey; + if (!targetKeys.isEmpty()) { + preferredShells = targetKeys.split(QLatin1Char(';')); } else { preferredShells << QLatin1String("xdg-shell"); preferredShells << QLatin1String("xdg-shell-v6"); |