From af8e75f54f54252cbb662eeb77697bdd8ec07296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 11 May 2023 10:43:27 +0000 Subject: [PATCH] Revert "QIconLoader: use system fallback theme as the first fallback option" This reverts commit 4710fb3528873e630b6b1e34c947a1c811e0e854. The theme it responsible for defining a set of good fallbacks, and we should respect that order. We should also respect any override the application developer does of the fallback theme, and not unconditionally fall back to the system fallback theme. Change-Id: I77f1a74c71a2a7db70464666b1a96a00fb4a1d8f Reviewed-by: Axel Spoerl --- src/gui/image/qiconloader.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 5a0b421b03e..92bb5e65db0 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -384,10 +384,6 @@ QIconTheme::QIconTheme(const QString &themeName) m_parents.append(fallback); } - // Use system fallback theme as the first fallback option - if (const QString &systemFallback = systemFallbackThemeName(); !systemFallback.isEmpty()) - m_parents.prepend(systemFallback); - // Ensure that all themes fall back to hicolor if (!m_parents.contains("hicolor"_L1)) m_parents.append("hicolor"_L1);