Skip to content

Commit

Permalink
Add an application icon.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sibras committed Nov 25, 2021
1 parent 5e99ac9 commit 39005ff
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ if(WIN32)
set_target_properties(ShiftIntrinsicGuide PROPERTIES
WIN32_EXECUTABLE TRUE
)
target_sources(ShiftIntrinsicGuide PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/source/Resources.rc"
)
elseif(APPLE)
set_target_properties(ShiftIntrinsicGuide PROPERTIES
MACOSX_BUNDLE TRUE
Expand Down Expand Up @@ -78,6 +81,7 @@ target_sources(ShiftIntrinsicGuide PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/source/MeasurementModel.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/source/Downloader.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/source/DataProvider.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/source/Resources.qrc"
)

target_compile_features(ShiftIntrinsicGuide
Expand Down
3 changes: 3 additions & 0 deletions source/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "MeasurementModel.h"
#include "Version.h"

#include <QIcon>
#include <QQmlContext>

Application::Application(int argc, char* argv[], QObject* parent) noexcept
Expand All @@ -43,6 +44,8 @@ Application::~Application() noexcept

int Application::run() noexcept
{
app.setWindowIcon(QIcon(":/icon.ico"));

// Register the GUI data model
engine.rootContext()->setContextProperty("application", this);
engine.rootContext()->setContextProperty("intrinsicsModel", &intrinsicsModel);
Expand Down
6 changes: 6 additions & 0 deletions source/Resources.qrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource>
<file>icon.ico</file>
</qresource>
</RCC>
1 change: 1 addition & 0 deletions source/Resources.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 ICON "icon.ico"
Binary file added source/icon.ico
Binary file not shown.

0 comments on commit 39005ff

Please sign in to comment.