From a97afeb7c7e089de5b630cd035a79db7c80a8957 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Tue, 21 Nov 2017 11:55:00 +0200
Subject: Prepare 3.0.2 release

Change-Id: Ia09157cb1984de782ffd2817f07afbcd3998c3b1
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
---
 Changelog                                                 | 10 ++++++++++
 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, 19 insertions(+), 9 deletions(-)

diff --git a/Changelog b/Changelog
index d97dfc8e1..ac76aef15 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,13 @@
+3.0.2
+- Add possibility to reopen admin query (QTIFW-988)
+- Implement package download resume (QTIFW-5)
+- Use QDir::rmdir and not rmpath as that will remove more than it should
+- Enable HighDPI support only in Windows
+- Do not reset core when pressing 'Restart' (QTIFW-1017)
+- Update italian translation
+- Update russian translation
+- Fixed building with dynamically linked Qt (QTIFW-993)
+
 3.0.1
 - Fix install type if --online-only passed to binarycreator
 - Fix install fail if there are missing repositories
diff --git a/dist/config/config.xml b/dist/config/config.xml
index f7d09e9d5..a0e92f9cd 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.0.1</Title>
-    <Version>3.0.1</Version>
+    <Title>Qt Installer Framework 3.0.2</Title>
+    <Version>3.0.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.0.1</TargetDir>
+    <TargetDir>@HomeDir@/Qt/QtIFW-3.0.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 71c32421c..3589a30ee 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.0.1</Version>
-    <ReleaseDate>2017-06-27</ReleaseDate>
+    <Version>3.0.2</Version>
+    <ReleaseDate>2017-11-21</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 ef97d39f9..371b0c973 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.0.1</Version>
-    <ReleaseDate>2017-06-27</ReleaseDate>
+    <Version>3.0.2</Version>
+    <ReleaseDate>2017-11-21</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 ff018f792..9bba83167 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -3,8 +3,8 @@
 }
 IFW_PRI_INCLUDED = 1
 
-IFW_VERSION_STR = 3.0.1
-IFW_VERSION = 0x030001
+IFW_VERSION_STR = 3.0.2
+IFW_VERSION = 0x030002
 
 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0
 IFW_NEWLINE = $$escape_expand(\\n\\t)
-- 
cgit v1.2.3