diff options
author | Iikka Eklund <iikka.eklund@qt.io> | 2017-01-12 10:24:40 +0200 |
---|---|---|
committer | Antti Kokko <antti.kokko@qt.io> | 2017-01-17 08:33:08 +0000 |
commit | 6189be519b1eb20187ec44928cad8ef1f7d69007 (patch) | |
tree | 51d296ec4c46a5991e56e18343798aacf419cb54 | |
parent | 52a1a20ccd283abcce0c1e78838e3ce2dddb4de6 (diff) |
Prepare 2.0.5 release
Changelog update.
Change-Id: I3afdc34ea66926827656a4eac8f7582fbd562056
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
-rw-r--r-- | Changelog | 5 | ||||
-rw-r--r-- | dist/config/config.xml | 4 | ||||
-rw-r--r-- | dist/packages/org.qtproject.ifw.binaries/meta/package.xml | 4 | ||||
-rw-r--r-- | dist/packages/org.qtproject.ifw/meta/package.xml | 4 | ||||
-rw-r--r-- | installerfw.pri | 4 |
5 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,8 @@ +2.0.5 +- Fix hang in Windows when admin rights needed. (QTIFW-902) +- Use deterministic sorting order for components. (QTIFW-833) +- Resolve relative URLs from Updates.xml. + 2.0.4 - Set also display name for Repository action "remove" - Adjusted wrong repogen parameter name diff --git a/dist/config/config.xml b/dist/config/config.xml index b3594c005..022f3f738 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.4</Title> + <Title>Qt Installer Framework 2.0.5</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.4</TargetDir> + <TargetDir>@HomeDir@/Qt/QtIFW2.0.5</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 675a8bccb..2391d7a51 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.4</Version> - <ReleaseDate>2016-10-13</ReleaseDate> + <Version>2.0.5</Version> + <ReleaseDate>2017-01-13</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 0e1eab3c4..bb3bccf94 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>2.0.4</Version> - <ReleaseDate>2016-10-13</ReleaseDate> + <Version>2.0.5</Version> + <ReleaseDate>2017-01-13</ReleaseDate> <Licenses> <License name="LGPL 2.1" file="LICENSE.LGPLv21" /> <License name="LGPL 3" file="LICENSE.LGPLv3" /> diff --git a/installerfw.pri b/installerfw.pri index 783125aa4..a0144c047 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -3,8 +3,8 @@ } IFW_PRI_INCLUDED = 1 -IFW_VERSION_STR = 2.0.4 -IFW_VERSION = 0x020004 +IFW_VERSION_STR = 2.0.5 +IFW_VERSION = 0x020005 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0 IFW_NEWLINE = $$escape_expand(\\n\\t) |