summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2019-12-05 14:45:30 +0200
committerKatja Marttila <katja.marttila@qt.io>2019-12-16 09:49:46 +0000
commit55ccd0b3f9cfbfdd550f0b671150c11a5b8cdd25 (patch)
tree2a7a9cf932f98bc1bdbe7867645ae93f84125658 /dist
parent0842ea01554202b4552911c827417acb00a03cf1 (diff)
Update IFW version number
Also make the predefined variable IFW_VERSION_STR available from xml and qs with @IFW_VERSION_STR@. IFW_VERSION_STR contains the installer framework version and can be set from installerfw.pri. Change-Id: Ifb232d7891b725c9d0d2ba18e691f7e818923432 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'dist')
-rw-r--r--dist/config/config.xml6
-rw-r--r--dist/packages/org.qtproject.ifw.binaries/meta/package.xml4
-rw-r--r--dist/packages/org.qtproject.ifw/meta/package.xml4
3 files changed, 7 insertions, 7 deletions
diff --git a/dist/config/config.xml b/dist/config/config.xml
index 1bd1bbe6e..847c44f18 100644
--- a/dist/config/config.xml
+++ b/dist/config/config.xml
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<Installer>
<Name>Qt Installer Framework</Name>
- <Title>Qt Installer Framework 3.2.0</Title>
- <Version>3.2.0</Version>
+ <Title>Qt Installer Framework @IFW_VERSION_STR@</Title>
+ <Version>@IFW_VERSION_STR@</Version>
<Publisher>Qt Project</Publisher>
<ProductUrl>http://qt-project.org</ProductUrl>
<Watermark>watermark.png</Watermark>
<MaintenanceToolName>Uninstaller</MaintenanceToolName>
<!-- Tweaked for windows in installscript.qs -->
- <TargetDir>@HomeDir@/Qt/QtIFW-3.2.0</TargetDir>
+ <TargetDir>@HomeDir@/Qt/QtIFW-@IFW_VERSION_STR@</TargetDir>
</Installer>
diff --git a/dist/packages/org.qtproject.ifw.binaries/meta/package.xml b/dist/packages/org.qtproject.ifw.binaries/meta/package.xml
index fd5b37e20..13aca6e1b 100644
--- a/dist/packages/org.qtproject.ifw.binaries/meta/package.xml
+++ b/dist/packages/org.qtproject.ifw.binaries/meta/package.xml
@@ -2,7 +2,7 @@
<Package>
<DisplayName>Qt Installer Framework Binaries</DisplayName>
<Description>Installs the binaries, examples and help files.</Description>
- <Version>3.2.0</Version>
- <ReleaseDate>2019-08-23</ReleaseDate>
+ <Version>@IFW_VERSION_STR@</Version>
+ <ReleaseDate>2019-12-05</ReleaseDate>
<Default>True</Default>
</Package>
diff --git a/dist/packages/org.qtproject.ifw/meta/package.xml b/dist/packages/org.qtproject.ifw/meta/package.xml
index f810f6286..fa941f213 100644
--- a/dist/packages/org.qtproject.ifw/meta/package.xml
+++ b/dist/packages/org.qtproject.ifw/meta/package.xml
@@ -2,8 +2,8 @@
<Package>
<DisplayName>Qt Installer Framework</DisplayName>
<Description>Installs the Qt Installer Framework.</Description>
- <Version>3.2.0</Version>
- <ReleaseDate>2019-08-23</ReleaseDate>
+ <Version>@IFW_VERSION_STR@</Version>
+ <ReleaseDate>2019-12-05</ReleaseDate>
<Licenses>
<License name="The Qt Company GPL Exception 1.0" file="LICENSE.GPL3-EXCEPT" />
<License name="Third Party Code Licenses" file="3RDPARTY" />