From 5a8caa6d06262381bf14980cd55e4e06b58d7298 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 11 Sep 2012 11:32:58 +0200
Subject: [PATCH] Use Webkit's SVG renderer for icons on macro page

---
 src/Gui/BitmapFactory.cpp | 3 +++
 src/Gui/DlgActionsImp.cpp | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Gui/BitmapFactory.cpp b/src/Gui/BitmapFactory.cpp
index 9b781a4d0..4b5adccb9 100644
--- a/src/Gui/BitmapFactory.cpp
+++ b/src/Gui/BitmapFactory.cpp
@@ -166,6 +166,9 @@ QStringList BitmapFactoryInst::findIconFiles() const
             files << it->absoluteFilePath();
     }
 
+#if QT_VERSION >= 0x040500
+    files.removeDuplicates();
+#endif
     return files;
 }
 
diff --git a/src/Gui/DlgActionsImp.cpp b/src/Gui/DlgActionsImp.cpp
index 6c392426b..664277bcb 100644
--- a/src/Gui/DlgActionsImp.cpp
+++ b/src/Gui/DlgActionsImp.cpp
@@ -384,7 +384,8 @@ IconDialog::IconDialog(QWidget* parent)
     QStringList names = BitmapFactory().findIconFiles();
     for (QStringList::Iterator it = names.begin(); it != names.end(); ++it) {
         item = new QListWidgetItem(ui->listWidget);
-        item->setIcon(QIcon(*it));
+        //item->setIcon(QIcon(*it));
+        item->setIcon(QIcon(BitmapFactory().pixmap((const char*)it->toUtf8())));
         item->setText(QFileInfo(*it).baseName());
         item->setToolTip(*it);
     }