From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Wed, 9 Nov 2016 16:50:49 +0000 (+0000)
Subject: add-mate-support
X-Git-Tag: archive/raspbian/4%4.8.7+dfsg-15+rpi1~1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=33a9333c347be16881462651adefa2f0ebf1a414;p=qt4-x11.git

add-mate-support


Gbp-Pq: Name add-mate-support.patch
---

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 2e666ce83..b630cab82 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -2361,6 +2361,12 @@ void qt_init(QApplicationPrivate *priv, int,
                 break;
             }
 
+            // Check the equivalent environment variable set by MATE
+            if (!qgetenv("MATE_DESKTOP_SESSION_ID").isEmpty()) {
+                X11->desktopEnvironment = DE_GNOME;
+                break;
+            }
+
             rc = XGetWindowProperty(X11->display, QX11Info::appRootWindow(), ATOM(_DT_SAVE_MODE),
                                     0, 2, False, XA_STRING, &type, &format, &length,
                                     &after, &data);