From f9c9adedf3997dd2073a05200d4d9e1f22285b3b Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 12 Jun 2017 16:57:16 +0100
Subject: [PATCH] Use logo.svg instead of icon.ico in qrenderdoc

* This means we don't need to distribute the ico reading qt plugin
---
 qrenderdoc/Code/CaptureContext.cpp   | 2 +-
 qrenderdoc/Windows/MainWindow.ui     | 2 +-
 qrenderdoc/Windows/TextureViewer.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp
index 758453598..549739f85 100644
--- a/qrenderdoc/Code/CaptureContext.cpp
+++ b/qrenderdoc/Code/CaptureContext.cpp
@@ -62,7 +62,7 @@ CaptureContext::CaptureContext(QString paramFilename, QString remoteHost, uint32
   qApp->setApplicationVersion(QString::fromLatin1(RENDERDOC_GetVersionString()));
 
   m_Icon = new QIcon();
-  m_Icon->addFile(QStringLiteral(":/icon.ico"), QSize(), QIcon::Normal, QIcon::Off);
+  m_Icon->addFile(QStringLiteral(":/logo.svg"), QSize(), QIcon::Normal, QIcon::Off);
 
   m_MainWindow = new MainWindow(*this);
   m_MainWindow->show();
diff --git a/qrenderdoc/Windows/MainWindow.ui b/qrenderdoc/Windows/MainWindow.ui
index 7e658d6a9..2fe3b6af5 100644
--- a/qrenderdoc/Windows/MainWindow.ui
+++ b/qrenderdoc/Windows/MainWindow.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../Resources/resources.qrc">
-    <normaloff>:/icon.ico</normaloff>:/icon.ico</iconset>
+    <normaloff>:/logo.svg</normaloff>:/logo.svg</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout">
diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index 91fcb18cf..9b7c2fbe1 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -1536,7 +1536,7 @@ void TextureViewer::SetupTextureTabs()
   ToolWindowManagerArea *textureTabs = ui->dockarea->areaOf(ui->renderContainer);
 
   QIcon tabIcon;
-  tabIcon.addFile(QStringLiteral(":/icon.ico"), QSize(), QIcon::Normal, QIcon::Off);
+  tabIcon.addFile(QStringLiteral(":/logo.svg"), QSize(), QIcon::Normal, QIcon::Off);
 
   textureTabs->setTabIcon(0, tabIcon);