summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2016-03-11 14:49:20 +0100
committerEike Ziller <eike.ziller@theqtcompany.com>2016-03-14 13:18:22 +0000
commitdb61acce80a7373f3b4cfcb84ca3af1e6264c3ac (patch)
tree0d3db559046793b5869478dffec0003f187730d5 /dist
parentc3772bfd4c52c453179b7e121900c06f72ed36a2 (diff)
downloadqt-creator-db61acce80a7373f3b4cfcb84ca3af1e6264c3ac.tar.gz
Installer: Support different display version than component version
The component version must be numeric, but we want to display e.g. Qt Creator 4.0.0-beta1 in the installer title. The change adds a -d parameter to the script and adds corresponding replacement variables. Display version falls back to component version. Change-Id: Ia8bcd05444e280f8a44ab321b043f4031725600d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'dist')
-rw-r--r--dist/installer/ifw/config/config-linux.xml.in6
-rw-r--r--dist/installer/ifw/config/config-mac.xml.in4
-rw-r--r--dist/installer/ifw/config/config-windows.xml.in4
3 files changed, 7 insertions, 7 deletions
diff --git a/dist/installer/ifw/config/config-linux.xml.in b/dist/installer/ifw/config/config-linux.xml.in
index 21cd64a425..eaa1531d26 100644
--- a/dist/installer/ifw/config/config-linux.xml.in
+++ b/dist/installer/ifw/config/config-linux.xml.in
@@ -2,7 +2,7 @@
<Installer>
<Name>Qt Creator</Name>
<Version>{version}</Version>
- <Title>Qt Creator {version}</Title>
+ <Title>Qt Creator {display_version}</Title>
<Publisher>Qt Project</Publisher>
<ProductUrl>http://www.qt.io</ProductUrl>
@@ -11,6 +11,6 @@
<WizardDefaultHeight>520</WizardDefaultHeight>
<MaintenanceToolName>QtCreatorUninstaller</MaintenanceToolName>
<!-- @homeDir@ and @rootDir@ are some of the supported vars -->
- <TargetDir>@homeDir@/qtcreator-{version}</TargetDir>
- <AdminTargetDir>/opt/qtcreator-{version}</AdminTargetDir>
+ <TargetDir>@homeDir@/qtcreator-{display_version}</TargetDir>
+ <AdminTargetDir>/opt/qtcreator-{display_version}</AdminTargetDir>
</Installer>
diff --git a/dist/installer/ifw/config/config-mac.xml.in b/dist/installer/ifw/config/config-mac.xml.in
index e3ecc20ed9..c7e28b41de 100644
--- a/dist/installer/ifw/config/config-mac.xml.in
+++ b/dist/installer/ifw/config/config-mac.xml.in
@@ -2,7 +2,7 @@
<Installer>
<Name>Qt Creator</Name>
<Version>{version}</Version>
- <Title>Qt Creator {version}</Title>
+ <Title>Qt Creator {display_version}</Title>
<Publisher>Qt Project</Publisher>
<ProductUrl>http://www.qt.io</ProductUrl>
@@ -11,6 +11,6 @@
<WizardDefaultHeight>560</WizardDefaultHeight>
<MaintenanceToolName>Uninstall Qt Creator</MaintenanceToolName>
<!-- @homeDir@ and @rootDir@ are some of the supported vars -->
- <TargetDir>@homeDir@/Applications/Qt Creator {version}</TargetDir>
+ <TargetDir>@homeDir@/Applications/Qt Creator {display_version}</TargetDir>
<AllowSpaceInPath>true</AllowSpaceInPath>
</Installer>
diff --git a/dist/installer/ifw/config/config-windows.xml.in b/dist/installer/ifw/config/config-windows.xml.in
index 574e70568c..584d67c5ef 100644
--- a/dist/installer/ifw/config/config-windows.xml.in
+++ b/dist/installer/ifw/config/config-windows.xml.in
@@ -2,7 +2,7 @@
<Installer>
<Name>Qt Creator</Name>
<Version>{version}</Version>
- <Title>Qt Creator {version}</Title>
+ <Title>Qt Creator {display_version}</Title>
<Publisher>Qt Project</Publisher>
<ProductUrl>http://www.qt.io</ProductUrl>
@@ -11,6 +11,6 @@
<WizardDefaultHeight>560</WizardDefaultHeight>
<MaintenanceToolName>QtCreatorUninst</MaintenanceToolName>
<!-- @homeDir@ and @rootDir@ are some of the supported vars -->
- <TargetDir>@rootDir@/Qt/qtcreator-{version}</TargetDir>
+ <TargetDir>@rootDir@/Qt/qtcreator-{display_version}</TargetDir>
<StartMenuDir>Qt Creator</StartMenuDir>
</Installer>