┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/kitemviews/kstandarditemlistwidget.cpp
diff options
context:
space:
mode:
authorAlexander Lohnau <[email protected]>2020-08-30 18:49:22 +0200
committerAlexander Lohnau <[email protected]>2020-08-30 18:49:22 +0200
commit5360bc3ab328c8b1161b0c5df9c5785829a3e880 (patch)
tree51a235044738fe1ad4e24a7fcc1bf2154c743909 /src/kitemviews/kstandarditemlistwidget.cpp
parent7c2559dd0bf469454fbd83cde74dbd15c9aa09bc (diff)
parent004734e8321778a22a648e73b5d1743b64ca2bda (diff)
Merge branch 'release/20.08'
Diffstat (limited to 'src/kitemviews/kstandarditemlistwidget.cpp')
-rw-r--r--src/kitemviews/kstandarditemlistwidget.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index bdb56ba78..3939fd237 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -1474,7 +1474,13 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStrin
QPixmap pixmap;
if (!QPixmapCache::find(key, &pixmap)) {
- const QIcon icon = QIcon::fromTheme(name, fallbackIcon);
+ QIcon icon = QIcon::fromTheme(name);
+ if (icon.isNull()) {
+ icon = QIcon(name);
+ }
+ if (icon.isNull()) {
+ icon = fallbackIcon;
+ }
pixmap = icon.pixmap(size / qApp->devicePixelRatio(), size / qApp->devicePixelRatio(), mode);
if (pixmap.width() != size || pixmap.height() != size) {