Merge with branch1.2

1 files changed, 5 insertions, 5 deletions

diff --git a/src/genericicondelegate.cpp b/src/genericicondelegate.cpp
index c3471735..3711b428 100644
--- a/src/genericicondelegate.cpp
+++ b/src/genericicondelegate.cpp
@@ -1,6 +1,7 @@
 #include "genericicondelegate.h"

 #include "pluginlist.h"

 #include <QList>

+#include <QPixmapCache>

 

 

 GenericIconDelegate::GenericIconDelegate(QObject *parent, int role, int logicalIndex, int compactSize)

@@ -19,14 +20,13 @@ void GenericIconDelegate::columnResized(int logicalIndex, int, int newSize)
   }

 }

 

-QList<QIcon> GenericIconDelegate::getIcons(const QModelIndex &index) const

+QList<QString> GenericIconDelegate::getIcons(const QModelIndex &index) const

 {

-  QList<QIcon> result;

+  QList<QString> result;

   if (index.isValid()) {

     foreach (const QVariant &var, index.data(m_Role).toList()) {

-      QIcon icon = var.value<QIcon>();

-      if (!m_Compact || !icon.isNull()) {

-        result.append(icon);

+      if (!m_Compact || !var.toString().isEmpty()) {

+        result.append(var.toString());

       }

     }

   }