rbutil: Always use svg icon for Window icon.

Since we now have svg support enabled (and used) for all platforms we
can simply use the svg one, and bring it in line with the rest of the
icon.

Change-Id: If99f1be0205de1a87eb727c33400811620d9876d

8 files changed, 0 insertions, 19 deletions

diff --git a/rbutil/rbutilqt/icons/rockbox-128.png b/rbutil/rbutilqt/icons/rockbox-128.png
deleted file mode 100644
index d11c33557f..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-128.png
+++ /dev/null
diff --git a/rbutil/rbutilqt/icons/rockbox-16.png b/rbutil/rbutilqt/icons/rockbox-16.png
deleted file mode 100644
index 8f477304a8..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-16.png
+++ /dev/null
diff --git a/rbutil/rbutilqt/icons/rockbox-256.png b/rbutil/rbutilqt/icons/rockbox-256.png
deleted file mode 100644
index 63abbc5427..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-256.png
+++ /dev/null
diff --git a/rbutil/rbutilqt/icons/rockbox-32.png b/rbutil/rbutilqt/icons/rockbox-32.png
deleted file mode 100644
index 68d324bbf0..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-32.png
+++ /dev/null
diff --git a/rbutil/rbutilqt/icons/rockbox-48.png b/rbutil/rbutilqt/icons/rockbox-48.png
deleted file mode 100644
index 1f6f1a98a7..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-48.png
+++ /dev/null
diff --git a/rbutil/rbutilqt/icons/rockbox-64.png b/rbutil/rbutilqt/icons/rockbox-64.png
deleted file mode 100644
index 5505833ded..0000000000
--- a/rbutil/rbutilqt/icons/rockbox-64.png
+++ /dev/null
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 76ef67f799..16735dc83a 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -88,20 +88,8 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent)
     HttpGet::setGlobalProxy(proxy());
     // init startup & autodetection
     ui.setupUi(this);
-#if defined(Q_OS_LINUX)
     QIcon windowIcon(":/icons/rockbox-clef.svg");
     this->setWindowIcon(windowIcon);
-#endif
-#if defined(Q_OS_WIN32)
-    QIcon windowIcon = QIcon();
-    windowIcon.addFile(":/icons/rockbox-16.png");
-    windowIcon.addFile(":/icons/rockbox-32.png");
-    windowIcon.addFile(":/icons/rockbox-48.png");
-    windowIcon.addFile(":/icons/rockbox-64.png");
-    windowIcon.addFile(":/icons/rockbox-128.png");
-    windowIcon.addFile(":/icons/rockbox-256.png");
-    this->setWindowIcon(windowIcon);
-#endif
 #if defined(Q_OS_MACX)
     // don't translate menu entries that are handled specially on OS X
     // (Configure, Quit). Qt handles them for us if they use english string.
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc
index b1427b118f..7ea638c54b 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/rbutil/rbutilqt/rbutilqt.qrc
@@ -33,13 +33,6 @@
         <file>icons/preferences-desktop-locale.svg</file>
         <file>icons/preferences-system.svg</file>
         <file>icons/process-stop.svg</file>
-        <file>icons/rblogo.png</file>
-        <file>icons/rockbox-16.png</file>
-        <file>icons/rockbox-32.png</file>
-        <file>icons/rockbox-48.png</file>
-        <file>icons/rockbox-64.png</file>
-        <file>icons/rockbox-128.png</file>
-        <file>icons/rockbox-256.png</file>
         <file>icons/system-search.svg</file>
         <file>icons/user-trash-full.svg</file>
         <file>icons/view-refresh.svg</file>