summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2020-02-26 14:24:20 +0200
committerKatja Marttila <katja.marttila@qt.io>2020-02-27 07:05:23 +0000
commitccafccfb442b2f1b3d0b70f5d899716cb787ee5a (patch)
tree24a02522778c4683349cc470f1b3a7f6331dcb03
parentaeaf4077892d06c2939dc7f9f376d335a0d48beb (diff)
Update IFW version to 3.2.2
Change-Id: I012d9c07fe5f6551e64aabe8debca76a40f5f3b2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--Changelog7
-rw-r--r--dist/config/config.xml6
-rw-r--r--dist/packages/org.qtproject.ifw.binaries/meta/package.xml4
-rw-r--r--installerfw.pri6
4 files changed, 15 insertions, 8 deletions
diff --git a/Changelog b/Changelog
index 039972215..15e27a3b4 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+3.2.2
+- Using Qt5.12.7 for binary builds (QTIFW-1632)
+- Add a command line argument to disable size check (QTIFW-1602)
+- Show information about updated components in repogen (QTIFW-1543)
+- Fix EnvironmentVariableOp undo behavior with non-persistent variables
+- Fix building against Qt 5.14 and newer (QTIFW-1526)
+
3.2.1
- Documentation fixes
- Fix QWizardPage title color (QTIFW-1557)
diff --git a/dist/config/config.xml b/dist/config/config.xml
index abf09b227..4a4cff488 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.1</Title>
- <Version>3.2.1</Version>
+ <Title>Qt Installer Framework 3.2.2</Title>
+ <Version>3.2.2</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.1</TargetDir>
+ <TargetDir>@HomeDir@/Qt/QtIFW-3.2.2</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 3f617a860..c1db33e8f 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.1</Version>
- <ReleaseDate>2020-01-14</ReleaseDate>
+ <Version>3.2.2</Version>
+ <ReleaseDate>2020-02-26</ReleaseDate>
<Default>True</Default>
</Package>
diff --git a/installerfw.pri b/installerfw.pri
index 3be89c11a..25eec935f 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -3,9 +3,9 @@
}
IFW_PRI_INCLUDED = 1
-IFW_VERSION_STR = 3.2.1
-IFW_VERSION = 0x030201
-IFW_VERSION_WIN32 = 3,2,1,0
+IFW_VERSION_STR = 3.2.2
+IFW_VERSION = 0x030202
+IFW_VERSION_WIN32 = 3,2,2,0
IFW_VERSION_STR_WIN32 = $$IFW_VERSION_STR\0