diff options
author | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 10:26:40 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 10:34:22 +0300 |
commit | a42a15779a4c75431add40f0b88fc57c591b1efa (patch) | |
tree | 74f97639b2d39be0599f4239f67121bdde846415 /dist | |
parent | 2385184b8b1aeaac6d0b42739b44c4786a6e9cab (diff) | |
parent | 7e91db5b1e01ffeeaa566ebb5b8230dcdc6b514f (diff) |
Merge remote-tracking branch 'origin/3.0'
Change-Id: Ic3c8005de03b2cc71436aaa18486085a845dca78
Diffstat (limited to 'dist')
-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 |
3 files changed, 6 insertions, 6 deletions
diff --git a/dist/config/config.xml b/dist/config/config.xml index 39ee262bc..2105b53c5 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.81</Title> + <Title>Qt Installer Framework 3.0.81</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/QtIFW-2.0.81</TargetDir> + <TargetDir>@HomeDir@/Qt/QtIFW-3.0.81</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 f820372fc..e2f51aa16 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.81</Version> - <ReleaseDate>2013-12-12</ReleaseDate> + <Version>3.0.81</Version> + <ReleaseDate>2017-03-29</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 68646ad28..5997adeaa 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.81</Version> - <ReleaseDate>2013-12-12</ReleaseDate> + <Version>3.0.81</Version> + <ReleaseDate>2017-03-29</ReleaseDate> <Licenses> <License name="The Qt Company GPL Exception 1.0" file="LICENSE.GPL3-EXCEPT" /> <License name="Third Party Code Licenses" file="3RDPARTY" /> |