From 0d998b3959d1d53000ceedd15a61da87e5d767d9 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Fri, 3 Jul 2020 21:02:51 +0100
Subject: [PATCH] [Installer] Show the full version number in the installer

---
 install.pri                          | 1 +
 installer/installbuilder/project.xml | 4 ++++
 installer/installbuilder/swift.xml   | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/install.pri b/install.pri
index ccbf80805..26d1a8a10 100644
--- a/install.pri
+++ b/install.pri
@@ -246,6 +246,7 @@ bitrock_builder_bin = $$(BITROCK_BUILDER)
                                     --setvars project.outputDirectory=$$shell_path($${PREFIX}/..) \
                                               project.installerFilename=$${INSTALLER_BASENAME}.$${INSTALLER_EXT} \
                                               project.version=$$swiftConfig(version.full) \
+                                              versionFull=$$swiftConfig(version.full).$${VER_REV} \
                                               project.windows64bitMode=$${WINDOWS64BITMODE} \
                                               project.enableDebugger=$${INSTALLER_DEBUG} \
                                               architecture=$${ARCHITECTURE}
diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml
index 0055717f1..0744f8faa 100644
--- a/installer/installbuilder/project.xml
+++ b/installer/installbuilder/project.xml
@@ -322,6 +322,10 @@ It must be closed before the installation can proceed</progressText>
                     <mustExist>0</mustExist>
                     <width>40</width>
                 </directoryParameter>
+                <stringParameter name="versionFull" value="" ask="0">
+                    <default></default>
+                    <allowEmptyValue>1</allowEmptyValue>
+                </stringParameter>
                 <stringParameter name="architecture" value="64" ask="0">
                     <description></description>
                     <explanation></explanation>
diff --git a/installer/installbuilder/swift.xml b/installer/installbuilder/swift.xml
index 85bb390f7..534b82273 100644
--- a/installer/installbuilder/swift.xml
+++ b/installer/installbuilder/swift.xml
@@ -1,6 +1,7 @@
 <componentGroup>
     <name>swift</name>
-    <description>swift</description>
+    <description>swift ${versionFull}</description>
+    <detailedDescription>swift ${versionFull}</detailedDescription>
     <canBeEdited>1</canBeEdited>
     <selected>1</selected>
     <show>1</show>