From 670e8b69f30cc64b1d4407e72847f3b6768dae2c Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Tue, 18 Jun 2019 07:47:00 +0300
Subject: Prepare 3.1.2 release

Change-Id: I3e0c2cb9825974ec42940c55d8d9b48afa770d8e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
---
 Changelog                                                 | 7 +++++++
 dist/config/config.xml                                    | 6 +++---
 dist/packages/org.qtproject.ifw.binaries/meta/package.xml | 4 ++--
 dist/packages/org.qtproject.ifw/meta/package.xml          | 4 ++--
 installerfw.pri                                           | 4 ++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Changelog b/Changelog
index a9f6fefd4..7092f60af 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+3.1.2
+- Gain admin rights for writing MaintenanceTool config files if needed (QTIFW-1363)
+- Update INSTALL file (QTIFW-1185)
+- Fix initially deactivated buttons when selecting components to update (QTIFW-1320)
+- Fix MaintenanceTool file write permission check on Linux and macOS (QTIFW-1324)
+- Fix installer hang on Windows with empty command prompt window appearing (QTIFW-1250)
+
 3.1.1
 - Add fetch to the same pane with package categories (QTIFW-1284)
 - Change text in Select Components view when selection of components is not possible (QTIFW-1241)
diff --git a/dist/config/config.xml b/dist/config/config.xml
index 412cd94bf..03be2f09f 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.1</Title>
-    <Version>3.1.1</Version>
+    <Title>Qt Installer Framework 3.1.2</Title>
+    <Version>3.1.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.1.1</TargetDir>
+    <TargetDir>@HomeDir@/Qt/QtIFW-3.1.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 bab942e75..c446455ef 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.1</Version>
-    <ReleaseDate>2019-05-02</ReleaseDate>
+    <Version>3.1.2</Version>
+    <ReleaseDate>2019-06-18</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 33f15e208..fb2b383e2 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.1</Version>
-    <ReleaseDate>2019-05-02</ReleaseDate>
+    <Version>3.1.2</Version>
+    <ReleaseDate>2019-06-18</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 86fcb2969..74c091e36 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -3,8 +3,8 @@
 }
 IFW_PRI_INCLUDED = 1
 
-IFW_VERSION_STR = 3.1.1
-IFW_VERSION = 0x030101
+IFW_VERSION_STR = 3.1.2
+IFW_VERSION = 0x030102
 
 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0
 IFW_NEWLINE = $$escape_expand(\\n\\t)
-- 
cgit v1.2.3