summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2018-03-19 09:05:19 +0200
committerKatja Marttila <katja.marttila@qt.io>2018-03-19 07:57:01 +0000
commit6f28abfa588d36076ad24f39a17d6752fd070ab6 (patch)
tree10f5da7c18e953a86c8f346a8b7431d5dbcc3ac0
parenta63e8f2dca5ab7104279ae95d950d7dbe42ba205 (diff)
Prepare 3.0.4 release3.0.4
Change-Id: I2a7453e0a2a540a223dbdd5282f63413db5eb30e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
-rw-r--r--Changelog9
-rw-r--r--dist/config/config.xml6
-rw-r--r--dist/packages/org.qtproject.ifw.binaries/meta/package.xml4
-rw-r--r--installerfw.pri4
4 files changed, 16 insertions, 7 deletions
diff --git a/Changelog b/Changelog
index 2e761ea6e..af16fa1ce 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,12 @@
+3.0.4
+- Fix infinite wait if downloadable package is missing (QTIFW-1064)
+- Fix the maintenancetool that failing to elevate to admin (QTIFW-1010)
+- Fix devtool's segmentation fault when using operation
+- Update Japanese translation
+- Remove unnecessary warning (QTIFW-1022)
+- Fix Mkdir operation in uninstall (QTIFW-1099)
+- Enable building IFW with Squish support
+
3.0.3
- Set correct proxy type (QTBUG-65143)
- Add no-proxy option (QTIFW-1085)
diff --git a/dist/config/config.xml b/dist/config/config.xml
index 002ec815d..515aa4b18 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.3</Title>
- <Version>3.0.3</Version>
+ <Title>Qt Installer Framework 3.0.4</Title>
+ <Version>3.0.4</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.3</TargetDir>
+ <TargetDir>@HomeDir@/Qt/QtIFW-3.0.4</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 bc6ed153b..d571b887d 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.3</Version>
- <ReleaseDate>2018-01-30</ReleaseDate>
+ <Version>3.0.4</Version>
+ <ReleaseDate>2018-03-20</ReleaseDate>
<Default>True</Default>
</Package>
diff --git a/installerfw.pri b/installerfw.pri
index 2b28422ff..cb37042d6 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -3,8 +3,8 @@
}
IFW_PRI_INCLUDED = 1
-IFW_VERSION_STR = 3.0.3
-IFW_VERSION = 0x030003
+IFW_VERSION_STR = 3.0.4
+IFW_VERSION = 0x030004
IFW_REPOSITORY_FORMAT_VERSION = 1.0.0
IFW_NEWLINE = $$escape_expand(\\n\\t)