summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2019-12-03 13:39:24 +0200
committerKatja Marttila <katja.marttila@qt.io>2019-12-03 12:54:40 +0000
commitd05dd83ea23897c1e5a893c29fa0f606f6a496b7 (patch)
tree164a45c44e6b787bcf93a7acb65deff623dca882
parentcb7667dd05766605a2bc63b4b2219799ca0ffa81 (diff)
Update IFW versio number to 3.2.0
Change-Id: I504389d78f9d831cb950cb36167ed0379cb7eb38 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r--Changelog2
-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
-rw-r--r--installerfw.pri6
5 files changed, 11 insertions, 11 deletions
diff --git a/Changelog b/Changelog
index 678c9e434..a0b5eafa4 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,4 @@
-3.1.2
+3.2.0
- Fix extracted files list formation in ExtractArchive operation (QTIFW-1239)
- Decrease the .dat file file size by writing file names to a separate file instead of .dat (QTIFW-1448)
- Use grid layout in component selection page (QTIFW-1334)
diff --git a/dist/config/config.xml b/dist/config/config.xml
index 03be2f09f..1bd1bbe6e 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.1.2</Title>
- <Version>3.1.2</Version>
+ <Title>Qt Installer Framework 3.2.0</Title>
+ <Version>3.2.0</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.1.2</TargetDir>
+ <TargetDir>@HomeDir@/Qt/QtIFW-3.2.0</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 c446455ef..e96c31803 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.1.2</Version>
- <ReleaseDate>2019-06-18</ReleaseDate>
+ <Version>3.2.0</Version>
+ <ReleaseDate>2019-12-03</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 fb2b383e2..f82ca1ec1 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.1.2</Version>
- <ReleaseDate>2019-06-18</ReleaseDate>
+ <Version>3.2.0</Version>
+ <ReleaseDate>2019-12-03</ReleaseDate>
<Licenses>
<License name="The Qt Company GPL Exception 1.0" file="LICENSE.GPL3-EXCEPT" />
<License name="Third Party Code Licenses" file="3RDPARTY" />
diff --git a/installerfw.pri b/installerfw.pri
index e15c7c411..cd1227aec 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -3,9 +3,9 @@
}
IFW_PRI_INCLUDED = 1
-IFW_VERSION_STR = 3.1.2
-IFW_VERSION = 0x030102
-IFW_VERSION_WIN32 = 3,1,2,0
+IFW_VERSION_STR = 3.2.0
+IFW_VERSION = 0x030200
+IFW_VERSION_WIN32 = 3,2,0,0
IFW_VERSION_STR_WIN32 = $$IFW_VERSION_STR\0