From a557b5af56189f87cbd44355b746742e3c2c5e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 15 Jun 2023 13:38:53 +0200 Subject: [PATCH] Use systemFallbackThemeName in QIconLoader::updateSystemTheme() The fallback logic in QIconLoader::updateSystemTheme() has been updated to match QIconLoader::ensureInitialized(), by using the systemFallbackThemeName() directly, rather than the possibly user set QIconLoader::fallbackThemeName(). Change-Id: Ib5aab62bbfb22683d3bddf87c4e798eca4a5af62 Reviewed-by: Axel Spoerl (cherry picked from commit 89fe1085903cab969ed65f05c7004e18a47d935a) Reviewed-by: Qt Cherry-pick Bot --- src/gui/image/qiconloader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 49e7b7731fe..cf8023c9c9b 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -122,7 +122,7 @@ void QIconLoader::updateSystemTheme() const QString currentSystemTheme = m_systemTheme; m_systemTheme = systemThemeName(); if (m_systemTheme.isEmpty()) - m_systemTheme = fallbackThemeName(); + m_systemTheme = systemFallbackThemeName(); if (m_systemTheme != currentSystemTheme) { qCDebug(lcIconLoader) << "Updated system theme to" << m_systemTheme; if (!hasUserTheme())