Merge pull request #7 from orange-vertex/app_icons

Provide icons for the windows and osx apps
SpaceGroupUCL · Jun 30, 2017 · 9bff037 · 9bff037
2 parents 1ac0f83 + 3569ac3
commit 9bff037
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/GuiApp/GuiApp.pro b/GuiApp/GuiApp.pro
@@ -3,10 +3,11 @@ include(../defaults.pri)
 QT         += core gui opengl widgets
 DEFINES    += _DEPTHMAP
 TEMPLATE   = app
-TARGET     =depthmapX
-
+TARGET     = depthmapX
+ICON       = icons/depthmapX.icns
 SOURCES    = main.cpp
 
+win32:RC_ICONS += icons/depthmapX.ico
 
 win32:Release:LIBS += -L../depthmapX/release -L../genlib/release -L../salalib/release
 win32:Debug:LIBS += -L../depthmapX/debug -L../genlib/debug -L../salalib/debug

diff --git a/GuiApp/icons/depthmapX.icns b/GuiApp/icons/depthmapX.icns
diff --git a/GuiApp/icons/depthmapX.ico b/GuiApp/icons/depthmapX.ico