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

@@ -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

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

src/swiftcore/swiftcore.rc

@@ -1 +0,0 @@
-IDI_ICON1  ICON DISCARDABLE "swiftcore.ico"

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

src/swiftdata/swiftdata.rc

@@ -1 +0,0 @@
-IDI_ICON1  ICON DISCARDABLE "swiftdata.ico"

src/swiftguistandard/swift.rc

@@ -1 +0,0 @@
-IDI_ICON1  ICON DISCARDABLE  "swift.ico"

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

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

src/swiftlauncher/swiftlauncher.rc

@@ -1 +0,0 @@
-IDI_ICON1  ICON DISCARDABLE  "swiftlauncher.ico"