summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@theqtcompany.com>2016-03-21 10:53:30 +0200
committerIikka Eklund <iikka.eklund@theqtcompany.com>2016-03-22 07:02:32 +0000
commit3388e613f2018661dced481bc9aa1c35b2e0531c (patch)
tree9e95a7d400b10c52ad875754a16b171d44d9bb9c
parente67fd518cbdf9c4ea99f88368f4c2b45e625c0c2 (diff)
Update version number for 2.0.3 release
Also update the Changelog. Change-Id: I2a74edd32783bdfb01d4706dcbc2d3ae78ac5069 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
-rw-r--r--Changelog6
-rw-r--r--dist/config/config.xml4
-rw-r--r--dist/packages/org.qtproject.ifw.binaries/meta/package.xml4
-rw-r--r--dist/packages/org.qtproject.ifw/meta/package.xml2
-rw-r--r--installerfw.pri4
5 files changed, 13 insertions, 7 deletions
diff --git a/Changelog b/Changelog
index 6e2b0a706..92cd9d1ad 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,9 @@
+2.0.3
+- Revert "Use QQmlV4Function to correctly get empty parameters from script."
+- Fix crash when updating admin installation with user/temp repository (QTIFW-740)
+- Compile with Qt 5.5, 5.6. Minimum version is now 5.5.
+- Fix compile with namespace'ed Qt.
+
2.0.2
- Doc: Remove dubious sentence from installer.calculateComponentsToUninstall().
- Update documentation for --runoperation.
diff --git a/dist/config/config.xml b/dist/config/config.xml
index e7a665621..052c367bc 100644
--- a/dist/config/config.xml
+++ b/dist/config/config.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Installer>
<Name>Qt Installer Framework</Name>
- <Title>Qt Installer Framework 2.0.2</Title>
+ <Title>Qt Installer Framework 2.0.3</Title>
<Version>1.0.0</Version>
<Publisher>Qt Project</Publisher>
<ProductUrl>http://qt-project.org</ProductUrl>
@@ -9,5 +9,5 @@
<MaintenanceToolName>Uninstaller</MaintenanceToolName>
<!-- Tweaked for windows in installscript.qs -->
- <TargetDir>@HomeDir@/Qt/QtIFW2.0.2</TargetDir>
+ <TargetDir>@HomeDir@/Qt/QtIFW2.0.3</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 8b20b4624..9071d167e 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>2.0.2</Version>
- <ReleaseDate>2015-06-16</ReleaseDate>
+ <Version>2.0.3</Version>
+ <ReleaseDate>2016-03-24</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 2cf18dbc9..93e8ef326 100644
--- a/dist/packages/org.qtproject.ifw/meta/package.xml
+++ b/dist/packages/org.qtproject.ifw/meta/package.xml
@@ -2,7 +2,7 @@
<Package>
<DisplayName>Qt Installer Framework</DisplayName>
<Description>Installs the Qt Installer Framework.</Description>
- <Version>2.0.2</Version>
+ <Version>2.0.3</Version>
<ReleaseDate>2015-06-16</ReleaseDate>
<Licenses>
<License name="LGPL 2.1" file="LICENSE.LGPLv21" />
diff --git a/installerfw.pri b/installerfw.pri
index f5e2e0e52..f2ee3dd67 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -3,8 +3,8 @@
}
IFW_PRI_INCLUDED = 1
-IFW_VERSION_STR = 2.0.2
-IFW_VERSION = 0x020002
+IFW_VERSION_STR = 2.0.3
+IFW_VERSION = 0x020003
IFW_REPOSITORY_FORMAT_VERSION = 1.0.0
IFW_NEWLINE = $$escape_expand(\\n\\t)