aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/configurations
diff options
context:
space:
mode:
authorAkseli Salovaara <akseli.salovaara@qt.io>2018-05-14 13:32:18 +0300
committerAkseli Salovaara <akseli.salovaara@qt.io>2018-05-17 16:16:55 +0000
commit8c7990bea7527df08cc7e4c0aeb41ad95c3d78aa (patch)
tree22426cdcee086f9dd55dccb2f59abdf02d3be25b /packaging-tools/configurations
parent3aedbaa0fda7c856c1bbafac037b6e6324d76c92 (diff)
Add Windows x86-tools-qtcreator-qt5-511x-conf for Qt offline installers
Add Windows x86-tools-qtcreator-qt5-511x-conf for Qt offline installers and update offline installer configuration file accordingly. Task-number: QTBUG-68251 Change-Id: Ibe4abaeb49de5d018887c10b1431c11431a72bc1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'packaging-tools/configurations')
-rw-r--r--packaging-tools/configurations/offline_installer_jobs/5.11.0/win_x86_offline2
-rw-r--r--packaging-tools/configurations/windows/x86/x86-tools-qtcreator-qt5-511x-conf64
2 files changed, 65 insertions, 1 deletions
diff --git a/packaging-tools/configurations/offline_installer_jobs/5.11.0/win_x86_offline b/packaging-tools/configurations/offline_installer_jobs/5.11.0/win_x86_offline
index 0cbb3e51b..254716a66 100644
--- a/packaging-tools/configurations/offline_installer_jobs/5.11.0/win_x86_offline
+++ b/packaging-tools/configurations/offline_installer_jobs/5.11.0/win_x86_offline
@@ -51,7 +51,7 @@ file_list: qt-conf,
android-qt5-5110-armv7-conf,
android-qt5-5110-x86-conf,
x86-tools-mingw530-conf,
- x86-tools-qtcreator-qt5-510x-conf,
+ x86-tools-qtcreator-qt5-511x-conf,
tools-qtcreatorcdbext-msvc2015-conf,
x86-tools-vcredist_msvc2015-conf,
x64-tools-vcredist_msvc2015-conf,
diff --git a/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-qt5-511x-conf b/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-qt5-511x-conf
new file mode 100644
index 000000000..96b35db75
--- /dev/null
+++ b/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-qt5-511x-conf
@@ -0,0 +1,64 @@
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the release tools of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+[qt.tools.qtcreator]
+archives: tools.qtcreator,
+ tools.qtcreator.wininterrupt32,
+ tools.qtcreator.wininterrupt64,
+ tools.sdktool
+target_install_base: /Tools/QtCreator
+package_default: true
+
+[tools.qtcreator]
+archive_uri: %QT_CREATOR_BASE_PATH%/windows_vs2015_32/qtcreator.7z
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: qtcreator.7z
+
+[tools.qtcreator.wininterrupt32]
+archive_uri: %QT_CREATOR_BASE_PATH%/windows_vs2015_32/wininterrupt.7z
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: wininterrupt32.7z
+
+[tools.qtcreator.wininterrupt64]
+archive_uri: %QT_CREATOR_BASE_PATH%/windows_vs2015_64/wininterrupt.7z
+package_strip_dirs: 0
+target_install_dir: /
+rpath_target:
+archive_name: wininterrupt64.7z
+
+[tools.sdktool]
+archive_uri: %QT_CREATOR_BASE_PATH%/windows_vs2015_32/sdktool.7z
+package_strip_dirs:
+target_install_dir: /bin
+rpath_target:
+archive_name: qtcreator_sdktool.7z