diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-20 09:13:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-20 17:08:39 +0100 |
| commit | f439108c4f6e456d329a666fe5000d07538b63c1 (patch) | |
| tree | b133a672e48c91746fc7bcdeeb7e8585b14d03be /src/platformsupport/services | |
| parent | e4b36acf1183a70907d570afc60ee4b17d03119e (diff) | |
Detect Unity by checking XDG_CURRENT_DESKTOP and use Gnome theme.
Fallback to Gtk for unknown desktops, which should be suitable
for most cases like XFCE.
Task-number: QTCREATORBUG-8254
Change-Id: Iaf9959f75852e03a83b5af7d0dead01ef657d678
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/platformsupport/services')
| -rw-r--r-- | src/platformsupport/services/genericunix/qgenericunixservices.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices.cpp b/src/platformsupport/services/genericunix/qgenericunixservices.cpp index f6bf8608d1..7d0145e61d 100644 --- a/src/platformsupport/services/genericunix/qgenericunixservices.cpp +++ b/src/platformsupport/services/genericunix/qgenericunixservices.cpp @@ -56,6 +56,10 @@ static inline QByteArray detectDesktopEnvironment() { if (!qEnvironmentVariableIsEmpty("KDE_FULL_SESSION")) return QByteArray("KDE"); + // Check Unity first, whose older versions also have "GNOME_DESKTOP_SESSION_ID" set. + const QByteArray xdgCurrentDesktop = qgetenv("XDG_CURRENT_DESKTOP"); + if (xdgCurrentDesktop == "Unity") + return QByteArrayLiteral("UNITY"); // GNOME_DESKTOP_SESSION_ID is deprecated for some reason, but still check it if (qgetenv("DESKTOP_SESSION") == "gnome" || !qEnvironmentVariableIsEmpty("GNOME_DESKTOP_SESSION_ID")) return QByteArray("GNOME"); |