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 c1fdc5f32be9fc1c1f9ef48faba4e04f)

Currently displaying revision c1fdc5f32be9fc1c1f9ef48faba4e04f , Show latest

--- a/cinnamon-session/main.c
+++ b/cinnamon-session/main.c
@@ -339,6 +339,18 @@ main (int argc, char **argv)
          */
         csm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
 
+        /* 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/meson.build
+++ b/meson.build
@@ -78,6 +78,7 @@ else
 endif
 conf.set('HAVE_ELOGIND', elogind.found())
 
+conf.set10('HAVE_QT57', get_option('with-qt5-theme-support'))
 
 xtest   = dependency('xtst',    required: false)
 conf.set('HAVE_XTEST', xtest.found())
@@ -196,6 +197,7 @@ message('\n'.join([
 '',
 '        GConf support:            @0@'.format(gconf.found()),
 '        Logind support:           @0@'.format(logind.found()),
+'        Qt 5.7+ theme support:    @0@'.format(get_option('with-qt5-theme-support')),
 '        IPv6 support:             @0@'.format(have_ipv6),
 '        Backtrace support:        @0@'.format(backtrace.found()),
 '        XRender support:          @0@'.format(xrender.found()),
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,4 +2,5 @@ option('with-frequent-warnings',  type:
 option('with-docbook',            type: 'boolean', value: true)
 option('with-gconf',              type: 'boolean', value: true)
 option('with-ipv6',               type: 'boolean', value: true)
+option('with-qt5-theme-support',  type: 'boolean', value: false)
 option('with-xtrans',             type: 'boolean', value: true)

Places

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

Places