File cinnamon-session-qt-5.7-styleoverride.patch of Package cinnamon-session

Overview Repositories Revisions Requests Users Attributes Meta

File cinnamon-session-qt-5.7-styleoverride.patch of Package cinnamon-session (Revision b97b898a3aa6b7904f55fd910200215a)

Currently displaying revision b97b898a3aa6b7904f55fd910200215a , Show latest

--- a/cinnamon-session/main.c
+++ b/cinnamon-session/main.c
@@ -383,8 +383,16 @@ main (int argc, char **argv)
          */
         csm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
 
-        /* Make QT5 apps follow the GTK style */
-        csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk");
+        /* Make Qt5 apps follow the GTK+ style */
+        if (!HAVE_QT57 && g_getenv ("QT_STYLE_OVERRIDE") == NULL) {
+            csm_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) {
+            csm_util_setenv ("QT_QPA_PLATFORMTHEME", "gtk2");
+        }
 
         /* GTK Overlay scrollbars */
         settings = g_settings_new ("org.cinnamon.desktop.interface");
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,19 @@ AC_SUBST(LOGIND_CFLAGS)
 AC_SUBST(LOGIND_LIBS)
 
 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 X development libraries check
 dnl ====================================================================

Places

File cinnamon-session-qt-5.7-styleoverride.patch of Package cinnamon-session (Revision b97b898a3aa6b7904f55fd910200215a)

Places