From a5b84b2eefb22e179a1173422c3345ff65735915 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Thu, 13 Aug 2020 12:34:12 +0200 Subject: [PATCH] Add windows app icon --- ScreenPlay/CMakeLists.txt | 9 +++++++-- ScreenPlay/Resources.qrc | 2 +- ScreenPlay/app.cpp | 2 +- .../assets/icons/{favicon.ico => app.ico} | Bin ScreenPlay/favicon.ico | Bin 277634 -> 0 bytes ScreenPlay/main.qml | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) rename ScreenPlay/assets/icons/{favicon.ico => app.ico} (100%) delete mode 100644 ScreenPlay/favicon.ico diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index aea23d3c..7e93b809 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -61,14 +61,19 @@ set(headers app.h qt5_add_big_resources(resources resources.qrc) if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(qml qml.qrc) + qt5_add_resources(qml qml.qrc) else() qtquick_compiler_add_resources(qml qml.qrc ) endif() - add_executable(${PROJECT_NAME} ${src} ${headers} ${resources} ${qml}) +if(WIN32) + # Icon + target_sources(${PROJECT_NAME} PRIVATE ScreenPlay.rc) +endif() + + # Disable console window on Windows # https://stackoverflow.com/questions/8249028/how-do-i-keep-my-qt-c-program-from-opening-a-console-in-windows set_property(TARGET ${PROJECT_NAME} PROPERTY WIN32_EXECUTABLE true) diff --git a/ScreenPlay/Resources.qrc b/ScreenPlay/Resources.qrc index 2461a0f8..d969f9a9 100644 --- a/ScreenPlay/Resources.qrc +++ b/ScreenPlay/Resources.qrc @@ -10,7 +10,6 @@ assets/fonts/NotoSans-Medium.ttf assets/fonts/NotoSans-Regular.ttf assets/fonts/NotoSans-Thin.ttf - assets/icons/favicon.ico assets/icons/font-awsome/close.svg assets/icons/font-awsome/frown-o.svg assets/icons/icon_arrow_left.svg @@ -101,5 +100,6 @@ legal/gpl-3.0.txt legal/lgpl-2.1.txt assets/icons/icon_delete.svg + assets/icons/app.ico diff --git a/ScreenPlay/app.cpp b/ScreenPlay/app.cpp index 6b75ad77..a439861d 100644 --- a/ScreenPlay/app.cpp +++ b/ScreenPlay/app.cpp @@ -43,7 +43,7 @@ namespace ScreenPlay { App::App() : QObject(nullptr) { - QGuiApplication::setWindowIcon(QIcon(":/assets/icons/favicon.ico")); + QGuiApplication::setWindowIcon(QIcon(":/assets/icons/app.ico")); QGuiApplication::setOrganizationName("ScreenPlay"); QGuiApplication::setOrganizationDomain("screen-play.app"); QGuiApplication::setApplicationName("ScreenPlay"); diff --git a/ScreenPlay/assets/icons/favicon.ico b/ScreenPlay/assets/icons/app.ico similarity index 100% rename from ScreenPlay/assets/icons/favicon.ico rename to ScreenPlay/assets/icons/app.ico diff --git a/ScreenPlay/favicon.ico b/ScreenPlay/favicon.ico deleted file mode 100644 index de00f568e16c6f86a623e2ab869f3212ca507b97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277634 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