From bb1d3e16fb3c85e1025566ccfb0a98e13bc134c4 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Fri, 19 Apr 2019 21:36:40 +0200
Subject: [PATCH] Convert executable icon to new method

Manually creating an RC file was the Qt 4 way. The Qt 5 way is just
giving it an icon.

When an RC_FILE isn't manually created Qt will attempt to create one. If
there are non-integers in the version number the compilation will crash.

AdvancedSettings_resource.rc is a build artifact on Windows.
---
 .gitignore                     | 3 ++-
 advancedSettings.pro           | 5 +++++
 build_scripts/qt/resources.pri | 2 +-
 src/res/icon.rc                | 1 -
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 src/res/icon.rc

diff --git a/.gitignore b/.gitignore
index 66cc3e3..83a7908 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ Makefile*
 installer/*.exe
 *.user*
 build_scripts/win/__pycache__
-build_scripts/win/current_build.bat
\ No newline at end of file
+build_scripts/win/current_build.bat
+AdvancedSettings_resource.rc
diff --git a/advancedSettings.pro b/advancedSettings.pro
index 2d4e754..d53dd70 100644
--- a/advancedSettings.pro
+++ b/advancedSettings.pro
@@ -5,6 +5,11 @@ DEFINES += ELPP_THREAD_SAFE ELPP_QT_LOGGING ELPP_NO_DEFAULT_LOG_FILE
 
 VERSION = "$$cat($$PWD/build_scripts/compile_version_string.txt)"
 DEFINES += APPLICATION_VERSION=\\\"$$VERSION\\\"
+# Qmake can't handle non-integers in the version string,
+# so we take out anything after the dash.
+SPLIT_VERSION_STRING = $$split(VERSION, -)
+NUMERICAL_VERSION_NUMBER = $$member(SPLIT_VERSION_STRING, 0, 0)
+VERSION = $$NUMERICAL_VERSION_NUMBER
 
 lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5.12 or higher")
 lessThan(QT_MINOR_VERSION, 12): error("requires Qt 5.12 or higher")
diff --git a/build_scripts/qt/resources.pri b/build_scripts/qt/resources.pri
index f0c32c9..7cf19f4 100644
--- a/build_scripts/qt/resources.pri
+++ b/build_scripts/qt/resources.pri
@@ -47,4 +47,4 @@ DISTFILES += \
     src/res/qml/desktop_overlay_page/translation_back_forwards/SteamDesktopTranslationBackForwards.qml \
     src/res/qml/desktop_overlay_page/translation_up_down/SteamDesktopTranslationUpDown.qml \
 
-RC_FILE = src/res/icon.rc
+win32:RC_ICONS += src/res/img/icons/advicon256px.ico
diff --git a/src/res/icon.rc b/src/res/icon.rc
deleted file mode 100644
index c1f36c5..0000000
--- a/src/res/icon.rc
+++ /dev/null
@@ -1 +0,0 @@
-IDI_ICON1               ICON    DISCARDABLE     "img/icons/advicon256px.ico"
\ No newline at end of file