1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

De-inline QIconLoader::themeName()

Browse Source 
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 <Friedemann.Kleint@qt.io>
(cherry picked from commit f3c2cf47fc35262dee0c4732ada6f334009cabf3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2023-06-12 12:42:42 +02:00 committed by Qt Cherry-pick Bot
parent 5783a384f9
commit 4f9b22fd00
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/image/qiconloader.cpp
View File

@ -142,6 +142,11 @@ void QIconLoader::invalidateKey()
QIconPrivate::clearIconCache(); QIconPrivate::clearIconCache();
} }
QString QIconLoader::themeName() const
{
return m_userTheme.isEmpty() ? m_systemTheme : m_userTheme;
}
void QIconLoader::setThemeName(const QString &themeName) void QIconLoader::setThemeName(const QString &themeName)
{ {
if (m_userTheme == themeName) if (m_userTheme == themeName)

2
src/gui/image/qiconloader_p.h
View File

@ -146,7 +146,7 @@ public:
QThemeIconInfo loadIcon(const QString &iconName) const; QThemeIconInfo loadIcon(const QString &iconName) const;
uint themeKey() const { return m_themeKey; } 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); void setThemeName(const QString &themeName);
QString fallbackThemeName() const; QString fallbackThemeName() const;
void setFallbackThemeName(const QString &themeName); void setFallbackThemeName(const QString &themeName);