From cc2639b72afa263ff09c231fdc7b98effb565004 Mon Sep 17 00:00:00 2001
From: Daenyth <Daenyth+git@gmail.com>
Date: Wed, 18 Jun 2014 02:13:27 -0400
Subject: [PATCH] Apply new icon to build

---
 cockatrice/CMakeLists.txt | 2 +-
 cockatrice/cockatrice.qrc | 2 +-
 cockatrice/src/main.cpp   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 1d915bdbf..7ae160d6c 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -165,7 +165,7 @@ if(UNIX)
         # Assume linux
         INSTALL(TARGETS cockatrice RUNTIME DESTINATION bin/)
         INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION ${ICONDIR}/hicolor/48x48/apps)
-        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps)
+        #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps)
         INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION ${DESKTOPDIR})
         INSTALL(FILES ${cockatrice_QM} DESTINATION share/cockatrice/translations)
     endif()
diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 451f9c1b3..c7d7c7280 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -29,7 +29,7 @@
         <file>resources/icon_update.png</file>
 	<file>resources/icon_view.svg</file>
         <file>resources/hr.jpg</file>
-        <file alias="resources/appicon.svg">resources/cockatrice.svg</file>
+        <file alias="resources/appicon.png">resources/cockatrice.png</file>
         <file>resources/add_to_sideboard.svg</file>
         <file>resources/decrement.svg</file>
         <file>resources/increment.svg</file>
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index 595a65341..bf82b3869 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
         MainWindow ui;
         qDebug("main(): MainWindow constructor finished");
         
-        QIcon icon(":/resources/appicon.svg");
+        QIcon icon(":/resources/appicon.png");
         ui.setWindowIcon(icon);
         
         ui.show();