root
/
dtkgui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: create icon engine faild on Qt6 

- 不需要考虑 DontFallbackToQIconFromTheme 这里是直接 new QIconLoaderEngine
- qErrnoWarning ==> qWarning 不需要 lasterror

Issue: https://github.com/linuxdeepin/developer-center/issues/8436,https://github.com/linuxdeepin/developer-center/issues/8241
This commit is contained in:
ck 2024-05-10 14:54:31 +08:00 committed by mike
parent 51c7e35161
commit 1c814a9217
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/private/diconproxyengine.cpp
View File

@ -261,12 +261,12 @@ void DIconProxyEngine::ensureEngine()
m_iconEngine = createDBuiltinIconEngine(m_iconName);
}
#ifdef DTK_DISABLE_LIBXDG
if (!m_iconEngine && Q_UNLIKELY(!m_option.testFlag(DIconTheme::DontFallbackToQIconFromTheme))) {
// fallback to QPlatformTheme::createIconEngine ==> QIconLoaderEngine
if (!m_iconEngine) {
QPlatformTheme * const platformTheme = QGuiApplicationPrivate::platformTheme();
bool hasUserTheme = QIconLoader::instance()->hasUserTheme();
if (platformTheme && !hasUserTheme) {
if (platformTheme) {
m_iconEngine = platformTheme->QPlatformTheme::createIconEngine(m_iconName);
} else {
qWarning() << "PlatformTheme not found!";
}
}
#else
@ -275,7 +275,7 @@ void DIconProxyEngine::ensureEngine()
}
#endif
if (!m_iconEngine && !nonCache[theme].contains(m_iconName)) {
qErrnoWarning("create icon [%s] engine failed.[theme:%s] nonCache[theme].size[%d]",
qWarning("create icon [%s] engine failed.[theme:%s] nonCache[theme].size[%d]",
m_iconName.toUtf8().data(),
theme.toUtf8().data(), nonCache[theme].size());
nonCache[theme].insert(m_iconName);