1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: Accept prioritized list of shell integrations

Browse Source 
[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>
This commit is contained in:
Paul Olav Tvete 2018-05-29 15:20:39 +02:00
parent 796b02d398
commit e6a0a0ce53
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -381,12 +381,12 @@ void QWaylandIntegration::initializeShellIntegration()
{ {
mShellIntegrationInitialized = true; mShellIntegrationInitialized = true;
QByteArray integrationName = qgetenv("QT_WAYLAND_SHELL_INTEGRATION"); QByteArray integrationNames = qgetenv("QT_WAYLAND_SHELL_INTEGRATION");
QString targetKey = QString::fromLocal8Bit(integrationName); QString targetKeys = QString::fromLocal8Bit(integrationNames);
QStringList preferredShells; QStringList preferredShells;
if (!targetKey.isEmpty()) { if (!targetKeys.isEmpty()) {
preferredShells << targetKey; preferredShells = targetKeys.split(QLatin1Char(';'));
} else { } else {
preferredShells << QLatin1String("xdg-shell"); preferredShells << QLatin1String("xdg-shell");
preferredShells << QLatin1String("xdg-shell-v6"); preferredShells << QLatin1String("xdg-shell-v6");