diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2016-10-13 12:24:39 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2016-10-13 11:02:04 +0000 |
| commit | c1b54a0a7b6c34a348a8f30826c8fc2d4b62d615 (patch) | |
| tree | 9beac70d54c49560090aca46154592f3de061d7e | |
| parent | 70d33027ad58f9e397f36745ac5b7b476fa9e1dc (diff) | |
Prepare 2.0.4 release
Update version number and ChangeLog.
Change-Id: I9b6e8f9576d74002577c8c913ae61c2b577ab0ff
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| -rw-r--r-- | Changelog | 9 | ||||
| -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, 17 insertions, 8 deletions
@@ -1,3 +1,12 @@ +2.0.4 +- Set also display name for Repository action "remove" +- Adjusted wrong repogen parameter name +- Fix settings test +- Make Execute operation work without arguments in Windows +- Add make install functionality with INSTALL_ROOT +- Do not force doc build on Linux when calling "make install" +- Documentation updates + 2.0.3 - Update Japanese translation. - Make IFW compile with FreeBSD. (QTIFW-841) diff --git a/dist/config/config.xml b/dist/config/config.xml index 052c367bc..b3594c005 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.3</Title> + <Title>Qt Installer Framework 2.0.4</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.3</TargetDir> + <TargetDir>@HomeDir@/Qt/QtIFW2.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 9071d167e..675a8bccb 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.3</Version> - <ReleaseDate>2016-03-24</ReleaseDate> + <Version>2.0.4</Version> + <ReleaseDate>2016-10-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 93e8ef326..0e1eab3c4 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.3</Version> - <ReleaseDate>2015-06-16</ReleaseDate> + <Version>2.0.4</Version> + <ReleaseDate>2016-10-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 f2ee3dd67..783125aa4 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -3,8 +3,8 @@ } IFW_PRI_INCLUDED = 1 -IFW_VERSION_STR = 2.0.3 -IFW_VERSION = 0x020003 +IFW_VERSION_STR = 2.0.4 +IFW_VERSION = 0x020004 IFW_REPOSITORY_FORMAT_VERSION = 1.0.0 IFW_NEWLINE = $$escape_expand(\\n\\t) |