diff options
author | Katja Marttila <katja.marttila@qt.io> | 2019-05-27 11:35:27 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2019-05-27 11:45:32 +0300 |
commit | 3946e2f8607282e054a76b119f1819b2535a0b8a (patch) | |
tree | f74144f8c5a1c4889bf81c89622567f564571fc8 /dist | |
parent | 8c448f77a00d01e24e4d083d9684c275b3efdd04 (diff) | |
parent | 6ea22a1a9ef9d9be25e09740aa72bb0a5dfebfc7 (diff) |
Merge remote-tracking branch 'origin/3.1' into master
Change-Id: I65e3ed3858cda954a5f916031d4ff02a39a9aa87
Diffstat (limited to 'dist')
-rw-r--r-- | dist/config/config.xml | 6 | ||||
-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 |
3 files changed, 7 insertions, 7 deletions
diff --git a/dist/config/config.xml b/dist/config/config.xml index 5985b88d7..02f979d19 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.1.0</Title> - <Version>3.1.0</Version> + <Title>Qt Installer Framework 3.2.0</Title> + <Version>3.2.0 </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.1.0</TargetDir> + <TargetDir>@HomeDir@/Qt/QtIFW-3.2.0</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 08b324aab..36b3f63bf 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.1.0</Version> - <ReleaseDate>2019-01-06</ReleaseDate> + <Version>3.2.0</Version> + <ReleaseDate>2019-05-27</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 40ea01b25..78276cbc8 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.1.0</Version> - <ReleaseDate>2019-01-06</ReleaseDate> + <Version>3.2.0</Version> + <ReleaseDate>2019-05-25</ReleaseDate> <Licenses> <License name="The Qt Company GPL Exception 1.0" file="LICENSE.GPL3-EXCEPT" /> <License name="Third Party Code Licenses" file="3RDPARTY" /> |