path: root/src/gui/image/qiconloader_p.h
diff options
authorSune Vuorela <>2015-06-15 21:16:24 +0200
committerSune Vuorela <>2015-06-18 04:57:02 +0000
commita8621a3f85e64f1252a80ae81a6e22554f7b3f44 (patch)
treec0e005017f3981d9b63a19f72d5d8eb2fe276496 /src/gui/image/qiconloader_p.h
parent0bd936e7f3f3bf54612748f0ade2b43de3ccdb0f (diff)
Respect manual set icon themes.
Currently all icon resolving is passed thru to the platform icon engine, even in the case where the application developer has set their own requested icon theme. In that case, the application developer specifically does not want to follow the icon theme of the system, so don't ask the platform, but rely on Qt code instead. It leads to bugs reported to platform icon theme providers like this: MMC: KDE: Thanks to the multimc people (Jan Dalheimer and Peterix) for the reports and testcases. Change-Id: I52cda6f688b2ef9e44e060c8ae67831cb02b26c8 Reviewed-by: Eike Hein <> Reviewed-by: Olivier Goffart (Woboq GmbH) <>
Diffstat (limited to 'src/gui/image/qiconloader_p.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h
index 38cf9c1736..5b0362e218 100644
--- a/src/gui/image/qiconloader_p.h
+++ b/src/gui/image/qiconloader_p.h
@@ -173,6 +173,7 @@ public:
void updateSystemTheme();
void invalidateKey() { m_themeKey++; }
void ensureInitialized();
+ bool hasUserTheme() const { return !m_userTheme.isEmpty(); }
QThemeIconInfo findIconHelper(const QString &themeName,