diff options
author | Katja Marttila <katja.marttila@qt.io> | 2019-03-19 11:55:02 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2019-03-19 11:55:02 +0200 |
commit | 8c448f77a00d01e24e4d083d9684c275b3efdd04 (patch) | |
tree | c75af0ceed6555249c6a2413dc5c0ff0aec928bb /dist | |
parent | 2beb45ea0317d0bed9d6085bd927f5a55dff25d5 (diff) | |
parent | 407b19ff904244e287d62c7d02ca2a0779fc7b09 (diff) |
Merge branch '3.1' into master
Change-Id: I2ac4e385ee771892369d98495ceceb09c481c018
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 a0e049792..5985b88d7 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.81</Title> - <Version>3.1.81</Version> + <Title>Qt Installer Framework 3.1.0</Title> + <Version>3.1.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.81</TargetDir> + <TargetDir>@HomeDir@/Qt/QtIFW-3.1.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 0d6a8ac22..08b324aab 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.81</Version> - <ReleaseDate>2017-04-06</ReleaseDate> + <Version>3.1.0</Version> + <ReleaseDate>2019-01-06</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 4f5628391..40ea01b25 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.81</Version> - <ReleaseDate>2017-04-06</ReleaseDate> + <Version>3.1.0</Version> + <ReleaseDate>2019-01-06</ReleaseDate> <Licenses> <License name="The Qt Company GPL Exception 1.0" file="LICENSE.GPL3-EXCEPT" /> <License name="Third Party Code Licenses" file="3RDPARTY" /> |