From bb65506d22d17a4035d83595b8c2fe69ccdd0d3d Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Thu, 31 Oct 2019 14:33:44 +0000
Subject: [PATCH] Fix version number embedding in Windows EXE and DLL files

Remove our Windows resource files (*.rc)
and let qmake generate them instead.
---
 mkspecs/features/version.pri              | 13 +++++++------
 src/swiftcore/swiftcore.pro               |  5 ++---
 src/swiftcore/swiftcore.rc                |  1 -
 src/swiftdata/swiftdata.pro               |  5 ++---
 src/swiftdata/swiftdata.rc                |  1 -
 src/swiftguistandard/swift.rc             |  1 -
 src/swiftguistandard/swiftguistandard.pro |  5 ++---
 src/swiftlauncher/swiftlauncher.pro       |  5 ++---
 src/swiftlauncher/swiftlauncher.rc        |  1 -
 9 files changed, 15 insertions(+), 22 deletions(-)
 delete mode 100644 src/swiftcore/swiftcore.rc
 delete mode 100644 src/swiftdata/swiftdata.rc
 delete mode 100644 src/swiftguistandard/swift.rc
 delete mode 100644 src/swiftlauncher/swiftlauncher.rc

diff --git a/mkspecs/features/version.pri b/mkspecs/features/version.pri
index 64c01e520..8d0b857e3 100644
--- a/mkspecs/features/version.pri
+++ b/mkspecs/features/version.pri
@@ -16,16 +16,17 @@ defineReplace(gitRevCount) {
 
 setSwiftConfig(version.full, $$swiftConfig(version.major).$$swiftConfig(version.minor).$$swiftConfig(version.micro))
 
-!win32 {
-    VER_MAJ = $$swiftConfig(version.major)
-    VER_MIN = $$swiftConfig(version.minor)
-    VER_PAT = $$swiftConfig(version.micro)
-    VERSION = $$swiftConfig(version.full)
-}
+VER_MAJ = $$swiftConfig(version.major)
+VER_MIN = $$swiftConfig(version.minor)
+VER_PAT = $$swiftConfig(version.micro)
+VERSION = $$swiftConfig(version.full)
 
 !isEmpty(GIT_BIN) {
     isEmpty(VER_REV) {
         VER_REV = $$gitRevCount()
         cache(VER_REV)
     }
+    win32: VERSION = $${VERSION}.$${VER_REV}
 }
+
+win32: CONFIG *= skip_target_version_ext
diff --git a/src/swiftcore/swiftcore.pro b/src/swiftcore/swiftcore.pro
index df4f70de7..e416fdbdd 100644
--- a/src/swiftcore/swiftcore.pro
+++ b/src/swiftcore/swiftcore.pro
@@ -17,9 +17,8 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
 
 INCLUDEPATH += . $$SourceRoot/src
 
-OTHER_FILES += *.qss *.ico *.rc *.icns
-RC_FILE = swiftcore.rc
-DISTFILES += swiftcore.rc
+OTHER_FILES += *.qss *.ico *.icns
+RC_ICONS = swiftcore.ico
 ICON = swiftcore.icns
 
 DESTDIR = $$DestRoot/bin
diff --git a/src/swiftcore/swiftcore.rc b/src/swiftcore/swiftcore.rc
deleted file mode 100644
index d374e9ac3..000000000
--- a/src/swiftcore/swiftcore.rc
+++ /dev/null
@@ -1 +0,0 @@
-IDI_ICON1  ICON DISCARDABLE "swiftcore.ico"
diff --git a/src/swiftdata/swiftdata.pro b/src/swiftdata/swiftdata.pro
index d9ae482ab..3af11d6d4 100644
--- a/src/swiftdata/swiftdata.pro
+++ b/src/swiftdata/swiftdata.pro
@@ -18,9 +18,8 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
 
 INCLUDEPATH += . $$SourceRoot/src
 
-OTHER_FILES += *.qss *.ico *.rc *.icns
-RC_FILE = swiftdata.rc
-DISTFILES += swiftdata.rc
+OTHER_FILES += *.qss *.ico *.icns
+RC_ICONS = swiftdata.ico
 ICON = swiftdata.icns
 
 DESTDIR = $$DestRoot/bin
diff --git a/src/swiftdata/swiftdata.rc b/src/swiftdata/swiftdata.rc
deleted file mode 100644
index c4ba8b6c3..000000000
--- a/src/swiftdata/swiftdata.rc
+++ /dev/null
@@ -1 +0,0 @@
-IDI_ICON1  ICON DISCARDABLE "swiftdata.ico"
diff --git a/src/swiftguistandard/swift.rc b/src/swiftguistandard/swift.rc
deleted file mode 100644
index b687e9a01..000000000
--- a/src/swiftguistandard/swift.rc
+++ /dev/null
@@ -1 +0,0 @@
-IDI_ICON1  ICON DISCARDABLE  "swift.ico"
diff --git a/src/swiftguistandard/swiftguistandard.pro b/src/swiftguistandard/swiftguistandard.pro
index 17b91dc8a..fd890b2d1 100644
--- a/src/swiftguistandard/swiftguistandard.pro
+++ b/src/swiftguistandard/swiftguistandard.pro
@@ -18,9 +18,8 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
 
 INCLUDEPATH += . $$SourceRoot/src
 
-OTHER_FILES += *.qss *.ico *.rc *.icns
-RC_FILE = swift.rc
-DISTFILES += swift.rc
+OTHER_FILES += *.qss *.ico *.icns
+RC_ICONS = swift.ico
 ICON = swift.icns
 
 DESTDIR = $$DestRoot/bin
diff --git a/src/swiftlauncher/swiftlauncher.pro b/src/swiftlauncher/swiftlauncher.pro
index e609b4d92..da6ce71b2 100644
--- a/src/swiftlauncher/swiftlauncher.pro
+++ b/src/swiftlauncher/swiftlauncher.pro
@@ -18,10 +18,9 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
 
 INCLUDEPATH += . $$SourceRoot/src
 
-OTHER_FILES += *.qss *.ico *.rc *.icns
+OTHER_FILES += *.qss *.ico *.icns
 RESOURCES += swiftlauncher.qrc
-RC_FILE = swiftlauncher.rc
-DISTFILES += swiftlauncher.rc
+RC_ICONS = swiftlauncher.ico
 ICON = swiftlauncher.icns
 
 DESTDIR = $$DestRoot/bin
diff --git a/src/swiftlauncher/swiftlauncher.rc b/src/swiftlauncher/swiftlauncher.rc
deleted file mode 100644
index aa6730851..000000000
--- a/src/swiftlauncher/swiftlauncher.rc
+++ /dev/null
@@ -1 +0,0 @@
-IDI_ICON1  ICON DISCARDABLE  "swiftlauncher.ico"