From 818c8ab9836c3e949e891e2266807dbd59c31906 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Fri, 4 Jan 2019 11:25:34 +0200
Subject: Prepare 3.1 release

Change-Id: I544869f1fe344ca076e23dc7809dc14aecf6ea3d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
---
 Changelog                                             | 19 +++++++++++++++++++
 dist/config/config.xml                                |  6 +++---
 .../org.qtproject.ifw.binaries/meta/package.xml       |  4 ++--
 dist/packages/org.qtproject.ifw/meta/package.xml      |  4 ++--
 installerfw.pri                                       |  4 ++--
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Changelog b/Changelog
index 1f3600c11..83b683f39 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,22 @@
+3.1.0
+- Fix wizard's maximum size not to exceed screen maximum size (QTIFW-1227)
+- Allow maintenancetool signing in Windows (QTIFW-667)
+- Enable usage of categorized repositories (QTIFW-1147)
+- Add possibility to check/uncheck repositories with one button click (QTIFW-1132)
+- Update danish (da) translation for Qt installer-framework
+- Add attribute to mark parts of install tree unstable (QTIFW-930)
+   -> Setting AllowUnstablecomponents to true in config.xml will
+    * allow installing other components when there are errors in scripts
+    * allow installing other components when there are missing dependencies
+    * allow installing other components when there are sha mismatches in metadata
+    * will mark the 'broken' components uninstallable in treeview
+- Add findFiles method (QTIFW-1094)
+- Enable expanding items by default
+- Add support dash (-) symbol in component name (QTIFW-948)
+- Allow comparing non-numeric versions (QTIFW-948)
+- Add Component::addAutoDependOn method
+- Teach 'binarycreator' and 'repogen' to repack packages from repository (QTIFW-925)
+
 3.0.6
 - Remove 'Your install seems to be corrupted' messagebox (QTIFW-1003)
 - Register virtual component for uninstall (QTIFW-1102)
diff --git a/dist/config/config.xml b/dist/config/config.xml
index a0e049792..5985b88d7 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.81</Title>
-    <Version>3.1.81</Version>
+    <Title>Qt Installer Framework 3.1.0</Title>
+    <Version>3.1.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.81</TargetDir>
+    <TargetDir>@HomeDir@/Qt/QtIFW-3.1.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 0d6a8ac22..08b324aab 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.81</Version>
-    <ReleaseDate>2017-04-06</ReleaseDate>
+    <Version>3.1.0</Version>
+    <ReleaseDate>2019-01-06</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 4f5628391..40ea01b25 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.81</Version>
-    <ReleaseDate>2017-04-06</ReleaseDate>
+    <Version>3.1.0</Version>
+    <ReleaseDate>2019-01-06</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 2810e5144..308268690 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -3,8 +3,8 @@
 }
 IFW_PRI_INCLUDED = 1
 
-IFW_VERSION_STR = 3.1.81
-IFW_VERSION = 0x030181
+IFW_VERSION_STR = 3.1.0
+IFW_VERSION = 0x030100
 
 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0
 IFW_NEWLINE = $$escape_expand(\\n\\t)
-- 
cgit v1.2.3