From 4f9b22fd008c2a912ef8fb12f53c612ce4edd70c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 12 Jun 2023 12:42:42 +0200 Subject: [PATCH] De-inline QIconLoader::themeName() The method is more than a plain getter, so keep it with the other logic of the class. Change-Id: I34aa185a51f04e3db3c1918f9723e53f33e5e9e1 Reviewed-by: Friedemann Kleint (cherry picked from commit f3c2cf47fc35262dee0c4732ada6f334009cabf3) Reviewed-by: Qt Cherry-pick Bot --- src/gui/image/qiconloader.cpp | 5 +++++ src/gui/image/qiconloader_p.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 077eefacb3c..aed173d76e5 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -142,6 +142,11 @@ void QIconLoader::invalidateKey() QIconPrivate::clearIconCache(); } +QString QIconLoader::themeName() const +{ + return m_userTheme.isEmpty() ? m_systemTheme : m_userTheme; +} + void QIconLoader::setThemeName(const QString &themeName) { if (m_userTheme == themeName) diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h index fbb21073ce3..0245123a833 100644 --- a/src/gui/image/qiconloader_p.h +++ b/src/gui/image/qiconloader_p.h @@ -146,7 +146,7 @@ public: QThemeIconInfo loadIcon(const QString &iconName) const; uint themeKey() const { return m_themeKey; } - QString themeName() const { return m_userTheme.isEmpty() ? m_systemTheme : m_userTheme; } + QString themeName() const; void setThemeName(const QString &themeName); QString fallbackThemeName() const; void setFallbackThemeName(const QString &themeName);