From 18c21633185e02f716f03a0a9f59050cdb8dbe6b Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Tue, 7 Aug 2018 16:06:01 +0200 Subject: [PATCH] ... --- CMakeLists.txt | 2 +- kima2.qrc | 5 +++++ src/gui/CMakeLists.txt | 3 +++ src/gui/mainwindow.cpp | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 kima2.qrc diff --git a/CMakeLists.txt b/CMakeLists.txt index c8dc075..0eddf82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set(kima2_SHARE kima2.desktop) if (WIN32 AND NOT UNIX) set(CPACK_GENERATOR "NSIS;ZIP") - set(CPACK_CREATE_DESKTOP_LINKS "bin/kima2") + #set(CPACK_CREATE_DESKTOP_LINKS "bin/kima2") else(WIN32 AND NOT UNIX) set(CPACK_SOURCE_GENERATOR "TBZ2") set(CPACK_GENERATOR "RPM;DEB") diff --git a/kima2.qrc b/kima2.qrc new file mode 100644 index 0000000..4164b56 --- /dev/null +++ b/kima2.qrc @@ -0,0 +1,5 @@ + + + misc/kima2.ico + + \ No newline at end of file diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 5ab6d47..ac28d7d 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -5,6 +5,8 @@ set(CMAKE_AUTOMOC ON) # Create code from a list of Qt designer ui files set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + # Find the QtWidgets library find_package(Qt5Widgets CONFIG REQUIRED) find_package(Qt5PrintSupport CONFIG REQUIRED) @@ -25,6 +27,7 @@ set(GUI_SOURCES reportmodel.cpp settingsdialog.cpp settingsdialog.ui + ../../kima2.qrc ) add_executable(kima2 ${GUI_SOURCES}) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index da2bad6..261774c 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -78,6 +78,7 @@ MainWindow::MainWindow() &MainWindow::onImportSalesJsonActionTriggered); readGeometry(); + setWindowIcon(QIcon(":/misc/kima2.ico")); } void MainWindow::onActionEditSellerTriggered()