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

QIcon: use fallback also with platform icon engine

Browse Source 
Amends a452e2254644ffbed289fdf051eaf41d7e6a3b0d. No new tests, existing
tests fails when QPlatformTheme returns a QIconEngine implementation
that provides the tested icons. However, the existing test fails when
the platform icon engine provides and address-book-new icon, and depends
on the order of test functions, as the name() test function modifies the
global theme name and search path. Fix those issues in the test.

Pick-to: 6.6
Change-Id: Ie1c1d14f08fad5e906296bab662df5cfacdbbf07
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Volker Hilsheimer 2023-07-13 15:24:35 +02:00
parent 3f9817b26c
commit cb16ba5980
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -620,11 +620,15 @@ QIconEngine *QIconLoader::iconEngine(const QString &iconName) const
qCDebug(lcIconLoader) << "Resolving icon engine for icon" << iconName; qCDebug(lcIconLoader) << "Resolving icon engine for icon" << iconName;
auto *platformTheme = QGuiApplicationPrivate::platformTheme(); auto *platformTheme = QGuiApplicationPrivate::platformTheme();
auto *iconEngine = hasUserTheme() || !platformTheme ? std::unique_ptr<QIconEngine> iconEngine;
new QIconLoaderEngine(iconName) : platformTheme->createIconEngine(iconName); if (!hasUserTheme() && platformTheme)
iconEngine.reset(platformTheme->createIconEngine(iconName));
if (!iconEngine || iconEngine->isNull()) {
iconEngine.reset(new QIconLoaderEngine(iconName));
}
qCDebug(lcIconLoader) << "Resulting engine" << iconEngine; qCDebug(lcIconLoader) << "Resulting engine" << iconEngine.get();
return iconEngine; return iconEngine.release();
} }
/*! /*!

7
tests/auto/gui/image/qicon/tst_qicon.cpp
View File

@ -552,6 +552,10 @@ void tst_QIcon::availableSizes()
void tst_QIcon::name() void tst_QIcon::name()
{ {
const auto reset = qScopeGuard([]{
QIcon::setThemeName({});
QIcon::setThemeSearchPaths({});
});
{ {
// No name if icon does not come from a theme // No name if icon does not come from a theme
QIcon icon(":/image.png"); QIcon icon(":/image.png");
@ -629,6 +633,7 @@ void tst_QIcon::task184901_badCache()
void tst_QIcon::fromTheme() void tst_QIcon::fromTheme()
{ {
const bool abIconFromPlatform = !QIcon::fromTheme("address-book-new").isNull();
QString firstSearchPath = QLatin1String(":/icons"); QString firstSearchPath = QLatin1String(":/icons");
QString secondSearchPath = QLatin1String(":/second_icons"); QString secondSearchPath = QLatin1String(":/second_icons");
QIcon::setThemeSearchPaths(QStringList() << firstSearchPath << secondSearchPath); QIcon::setThemeSearchPaths(QStringList() << firstSearchPath << secondSearchPath);
@ -725,7 +730,7 @@ void tst_QIcon::fromTheme()
// Make sure setting the theme name clears the state // Make sure setting the theme name clears the state
QIcon::setThemeName(""); QIcon::setThemeName("");
abIcon = QIcon::fromTheme("address-book-new"); abIcon = QIcon::fromTheme("address-book-new");
QVERIFY(abIcon.isNull()); QCOMPARE_NE(abIcon.isNull(), abIconFromPlatform);
// Test fallback icon behavior for empty theme names. // Test fallback icon behavior for empty theme names.
// Can only reliably test this on systems that don't have a // Can only reliably test this on systems that don't have a