2 files changed, 22 insertions, 10 deletions
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices.cpp b/src/platformsupport/services/genericunix/qgenericunixservices.cpp
index fedaa3a655..77ea0f1db8 100644
--- a/src/platformsupport/services/genericunix/qgenericunixservices.cpp
+++ b/src/platformsupport/services/genericunix/qgenericunixservices.cpp
@@ -54,16 +54,24 @@ enum { debug = 0 };
 
 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");
-    return QByteArray("UNKNOWN");
+    if (!xdgCurrentDesktop.isEmpty())
+        return xdgCurrentDesktop.toUpper(); // KDE, GNOME, UNITY, LXDE, MATE, XFCE...
+
+    // Classic fallbacks
+    if (!qEnvironmentVariableIsEmpty("KDE_FULL_SESSION"))
+        return QByteArrayLiteral("KDE");
+    if (!qEnvironmentVariableIsEmpty("GNOME_DESKTOP_SESSION_ID"))
+        return QByteArrayLiteral("GNOME");
+
+    // Fallback to checking $DESKTOP_SESSION (unreliable)
+    const QByteArray desktopSession = qgetenv("DESKTOP_SESSION");
+    if (desktopSession == "gnome")
+        return QByteArrayLiteral("GNOME");
+    if (desktopSession == "xfce")
+        return QByteArrayLiteral("XFCE");
+
+    return QByteArrayLiteral("UNKNOWN");
 }
 
 static inline bool checkExecutable(const QString &candidate, QString *result)
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
index 6ea68397b6..196f67bcd8 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
@@ -425,7 +425,11 @@ QStringList QGenericUnixTheme::themeNames()
 #ifndef QT_NO_SETTINGS
             result.push_back(QLatin1String(QKdeTheme::name));
 #endif
-        } else { // Gnome, Unity, other Gtk-based desktops like XFCE.
+        } else if (desktopEnvironment == QByteArrayLiteral("GNOME") ||
+                desktopEnvironment == QByteArrayLiteral("UNITY") ||
+                desktopEnvironment == QByteArrayLiteral("MATE") ||
+                desktopEnvironment == QByteArrayLiteral("XFCE") ||
+                desktopEnvironment == QByteArrayLiteral("LXDE")) { // Gtk-based desktops
             // prefer the GTK2 theme implementation with native dialogs etc.
             result.push_back(QStringLiteral("gtk2"));
             // fallback to the generic Gnome theme if loading the GTK2 theme fails