Apply Raphaël Halimi's patch to add MATE detection (Closes: #825769).

parent 0cf8e34b
......@@ -3,6 +3,9 @@ qt4-x11 (4:4.8.7+dfsg-8) UNRELEASED; urgency=medium
[ Pino Toscano ]
* Disable pch also on powerpcspe; thanks Roland Stigge. (Closes: #773270)
[ Lisandro Damián Nicanor Pérez Meyer ]
* Apply Raphaël Halimi's patch to add MATE detection (Closes: #825769).
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 22 May 2016 19:33:08 +0200
qt4-x11 (4:4.8.7+dfsg-7) unstable; urgency=medium
......
Description: Add support for MATE desktop
This patch checks for an environment variable set by MATE desktop, in order to
make Qt4 applications natively use the GTK+ style when run on this desktop
Author: Raphaël Halimi <raphael.halimi@gmail.com>
Origin: other
Last-Update: 2016-05-29
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
src/gui/kernel/qapplication_x11.cpp | 6 ++++++
1 file changed, 6 insertions(+)
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -2361,6 +2361,12 @@ void qt_init(QApplicationPrivate *priv,
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);
......@@ -61,3 +61,4 @@ QtScript_x32_config.diff
x32.diff
no-ssl3.patch
qt-everywhere-opensource-src-4.8.7-gcc6.patch
add-mate-support.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment