diff options
| author | Martin Gräßlin <mgraesslin@kde.org> | 2014-02-06 13:40:50 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-02-07 10:52:21 +0100 |
| commit | 381f452aa22df6ceda23493d78a0c158a2fa6318 (patch) | |
| tree | 9c5d5053a9d0423cdd5cd47b7f6cc884f11f8318 | |
| parent | e5d1d051e413160e37e7b61d8d7ad74298f98a76 (diff) | |
| download | qtwayland-381f452aa22df6ceda23493d78a0c158a2fa6318.tar.gz qtwayland-381f452aa22df6ceda23493d78a0c158a2fa6318.tar.bz2 qtwayland-381f452aa22df6ceda23493d78a0c158a2fa6318.zip | |
Provide "kde" in the themeNames
KDE would like to get its integration plugin on Wayland.
The name won't change for Wayland, so filtering it out
because it is the name of the X11 desktop environment is
wrong.
The patch follows the approach of the QGenericUnixTheme.
Change-Id: Ia9c253ae6b5d609bd3bc630ce5c36b89811b079a
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index b354ac07..02b7e56c 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -84,15 +84,18 @@ public: if (QGuiApplication::desktopSettingsAware()) { const QByteArray desktopEnvironment = QGuiApplicationPrivate::platformIntegration()->services()->desktopEnvironment(); - // Ignore X11 desktop environments - if (!desktopEnvironment.isEmpty() && + if (desktopEnvironment == QByteArrayLiteral("KDE")) { +#ifndef QT_NO_SETTINGS + result.push_back(QStringLiteral("kde")); +#endif + } else if (!desktopEnvironment.isEmpty() && desktopEnvironment != QByteArrayLiteral("UNKNOWN") && - desktopEnvironment != QByteArrayLiteral("KDE") && desktopEnvironment != QByteArrayLiteral("GNOME") && desktopEnvironment != QByteArrayLiteral("UNITY") && desktopEnvironment != QByteArrayLiteral("MATE") && desktopEnvironment != QByteArrayLiteral("XFCE") && desktopEnvironment != QByteArrayLiteral("LXDE")) + // Ignore X11 desktop environments result.push_back(QString::fromLocal8Bit(desktopEnvironment.toLower())); } |