Fix file preview for desktop files with absolute icon paths

[dolphin.git] / src / kitemviews / kstandarditemlistwidget.cpp

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 13f80996d4e66fa3f6576391a4b8c5d778ecd870..15a618207f286bcebff67a90a1c4603305021e77 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -1487,7 +1487,13 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStrin
     QPixmap pixmap;
 
     if (!QPixmapCache::find(key, pixmap)) {
     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) {
 
         pixmap = icon.pixmap(size / qApp->devicePixelRatio(), size / qApp->devicePixelRatio(), mode);
         if (pixmap.width() != size || pixmap.height() != size) {