File mate-session-manager-qt-5.7-styleoverride.patch of Package mate-session-manager

Overview Repositories Revisions Requests Users Attributes Meta

File mate-session-manager-qt-5.7-styleoverride.patch of Package mate-session-manager (Revision d2358836f59e851196d58f77acf6731b)

Currently displaying revision d2358836f59e851196d58f77acf6731b , Show latest

--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,19 @@ AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use
 AC_SUBST(HAVE_SYSTEMD)
 
 dnl ====================================================================
+dnl Check for Qt 5.7+ to set correct env var for theme/styling
+dnl ====================================================================
+AC_DEFINE([HAVE_QT57], [0], [Have Qt 5.7+])
+AC_ARG_ENABLE(qt57_theme_support,
+              AS_HELP_STRING([--enable-qt57-theme-support], [Support GTK+ styles for Qt apps with Qt 5.7+]),
+              [enable_qt57_theme_support=yes],
+              [enable_qt57_theme_support=no])
+
+if test x$enable_qt57_theme_support = xyes; then
+    AC_DEFINE([HAVE_QT57], [1])
+fi
+
+dnl ====================================================================
 dnl Check for XSync extension
 dnl ====================================================================
 
--- a/mate-session/main.c
+++ b/mate-session/main.c
@@ -646,6 +646,21 @@ int main(int argc, char** argv)
 	 */
 	gsm_util_setenv("MATE_DESKTOP_SESSION_ID", "this-is-deprecated");
 
+        /* Make Qt5 apps follow the GTK+ style */
+	if (!HAVE_QT57 && g_getenv("QT_STYLE_OVERRIDE") == NULL)
+	{
+		gsm_util_setenv("QT_STYLE_OVERRIDE", "gtk");
+	}
+	else if (HAVE_QT57 && g_getenv("QT_STYLE_OVERRIDE") != NULL)
+	{
+		g_unsetenv("QT_STYLE_OVERRIDE");
+	}
+
+	if (HAVE_QT57 && g_getenv("QT_QPA_PLATFORMTHEME") == NULL)
+	{
+		gsm_util_setenv("QT_QPA_PLATFORMTHEME", "gtk2");
+	}
+
 	/*
 	 * Make sure gsettings is set up correctly.  If not, then bail.
 	 */

Places

File mate-session-manager-qt-5.7-styleoverride.patch of Package mate-session-manager (Revision d2358836f59e851196d58f77acf6731b)

Places