From e10545f37c318bdd5fca0b9b6e7a16a222aa52db Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Thu, 2 May 2019 13:27:36 +0300
Subject: [PATCH] Prepare 3.1.1 release

Change-Id: I4aae0b0a95cfdb94c608001b3d636cf2c535c4f6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
---
 Changelog                                                 | 8 ++++++++
 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, 17 insertions(+), 9 deletions(-)

diff --git a/Changelog b/Changelog
index 83b683f3..d7442c85 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,11 @@
+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)
+- Fix long description texts not properly shown by enabling scrolling (QTIFW-1308)
+- Fix install button string having a font name in French translation (QTIFW-1333)
+- Fix maintenancetool size (QTIFW-1322)
+- Update Russian translation
+
 3.1.0
 - Fix wizard's maximum size not to exceed screen maximum size (QTIFW-1227)
 - Allow maintenancetool signing in Windows (QTIFW-667)
diff --git a/dist/config/config.xml b/dist/config/config.xml
index 5985b88d..412cd94b 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.0</Title>
-    <Version>3.1.0</Version>
+    <Title>Qt Installer Framework 3.1.1</Title>
+    <Version>3.1.1</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.0</TargetDir>
+    <TargetDir>@HomeDir@/Qt/QtIFW-3.1.1</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 08b324aa..bab942e7 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.0</Version>
-    <ReleaseDate>2019-01-06</ReleaseDate>
+    <Version>3.1.1</Version>
+    <ReleaseDate>2019-05-02</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 40ea01b2..33f15e20 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.0</Version>
-    <ReleaseDate>2019-01-06</ReleaseDate>
+    <Version>3.1.1</Version>
+    <ReleaseDate>2019-05-02</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 30826869..86fcb296 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -3,8 +3,8 @@
 }
 IFW_PRI_INCLUDED = 1
 
-IFW_VERSION_STR = 3.1.0
-IFW_VERSION = 0x030100
+IFW_VERSION_STR = 3.1.1
+IFW_VERSION = 0x030101
 
 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0
 IFW_NEWLINE = $$escape_expand(\\n\\t)