Skip to content

Commit fb35ec7

Browse files
ilya-fedinjohn-preston
authored andcommitted
Fix fallback icon theme
This ensures there's always a fallback to application icons
1 parent b88d491 commit fb35ec7

File tree

1 file changed

+34
-0
lines changed

1 file changed

+34
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/src/gui/platform/unix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp
2+
index 8b65711ff2e..345d2090f2d 100644
3+
--- a/src/gui/platform/unix/qgenericunixthemes.cpp
4+
+++ b/src/gui/platform/unix/qgenericunixthemes.cpp
5+
@@ -1383,7 +1383,7 @@ QVariant QGnomeTheme::themeHint(QPlatformTheme::ThemeHint hint) const
6+
case QPlatformTheme::SystemIconThemeName:
7+
return QVariant(QStringLiteral("Adwaita"));
8+
case QPlatformTheme::SystemIconFallbackThemeName:
9+
- return QVariant(QStringLiteral("gnome"));
10+
+ return QVariant(QStringLiteral("hicolor"));
11+
case QPlatformTheme::IconThemeSearchPaths:
12+
return QVariant(QGenericUnixTheme::xdgIconThemePaths());
13+
case QPlatformTheme::IconPixmapSizes:
14+
diff --git a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
15+
index b21c45da7a0..b496d669f85 100644
16+
--- a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
17+
+++ b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
18+
@@ -95,7 +95,6 @@ QGtk3Theme::QGtk3Theme()
19+
SETTING_CONNECT("gtk-entry-password-hint-timeout");
20+
SETTING_CONNECT("gtk-dnd-drag-threshold");
21+
SETTING_CONNECT("gtk-icon-theme-name");
22+
- SETTING_CONNECT("gtk-fallback-icon-theme");
23+
SETTING_CONNECT("gtk-font-name");
24+
SETTING_CONNECT("gtk-application-prefer-dark-theme");
25+
SETTING_CONNECT("gtk-theme-name");
26+
@@ -136,8 +135,6 @@ QVariant QGtk3Theme::themeHint(QPlatformTheme::ThemeHint hint) const
27+
return QVariant(gtkSetting<gint>("gtk-dnd-drag-threshold"));
28+
case QPlatformTheme::SystemIconThemeName:
29+
return QVariant(gtkSetting("gtk-icon-theme-name"));
30+
- case QPlatformTheme::SystemIconFallbackThemeName:
31+
- return QVariant(gtkSetting("gtk-fallback-icon-theme"));
32+
case QPlatformTheme::MouseCursorTheme:
33+
return QVariant(gtkSetting("gtk-cursor-theme-name"));
34+
case QPlatformTheme::MouseCursorSize: {

0 commit comments

Comments
 (0)