Qt Creator: 4.9.0 -> stable, 4.10.0-beta1 -> master

Also removes some msvc2015 from the names

Change-Id: I832de0b003af3093ca25102801dc5bf6812990ec
Reviewed-by: Antti Kokko <antti.kokko@qt.io>

8 files changed, 75 insertions, 28 deletions

diff --git a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x64_msvc2015 b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x64
index 953ac50f8..b56a4eea7 100644
--- a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x64_msvc2015
+++ b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x64
@@ -35,10 +35,10 @@ identifier:             windows
 [PackageConfigurationFiles]
 file_list:              qt-conf,
                         qtcreator-license-conf,
-                        x64-tools-qtcreator-msvc2015-conf,
-                        tools-qtcreatorcdbext-msvc2015-standalone-conf,
-                        x86-tools-vcredist_msvc2015-conf,
-                        x64-tools-vcredist_msvc2015-conf
+                        x64-tools-qtcreator-standalone-conf,
+                        tools-qtcreatorcdbext-standalone-conf,
+                        x86-tools-vcredist_msvc2017-conf,
+                        x64-tools-vcredist_msvc2017-conf
 
 [ConfigDir]
 template_name:          config_qtcreator
diff --git a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x86_msvc2015 b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x86
index dedd32930..e8e88b5e9 100644
--- a/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x86_msvc2015
+++ b/packaging-tools/configurations/offline_installer_jobs/qtcreator/win_x86
@@ -35,10 +35,10 @@ identifier:             windows
 [PackageConfigurationFiles]
 file_list:              qt-conf,
                         qtcreator-license-conf,
-                        x86-tools-qtcreator-msvc2015-conf,
-                        tools-qtcreatorcdbext-msvc2015-standalone-conf,
-                        x86-tools-vcredist_msvc2015-conf,
-                        x64-tools-vcredist_msvc2015-conf
+                        x86-tools-qtcreator-standalone-conf,
+                        tools-qtcreatorcdbext-standalone-conf,
+                        x86-tools-vcredist_msvc2017-conf,
+                        x64-tools-vcredist_msvc2017-conf
 
 [ConfigDir]
 template_name:          config_qtcreator
diff --git a/packaging-tools/configurations/repository_configs/tools_desktop/win_x86_repository_tools_qtcreator b/packaging-tools/configurations/repository_configs/tools_desktop/win_x86_repository_tools_qtcreator
index 3370bd8be..58f1b8e4e 100644
--- a/packaging-tools/configurations/repository_configs/tools_desktop/win_x86_repository_tools_qtcreator
+++ b/packaging-tools/configurations/repository_configs/tools_desktop/win_x86_repository_tools_qtcreator
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2019 Digia Plc and/or its subsidiary(-ies).
 ## Contact: http://www.qt-project.org/legal
 ##
 ## This file is part of the release tools of the Qt Toolkit.
@@ -47,7 +47,7 @@ identifier:             windows
 
 [PackageConfigurationFiles]
 file_list:              x86-tools-qtcreator-online-conf,
-                        tools-qtcreatorcdbext-msvc2015-conf
+                        tools-qtcreatorcdbext-online-conf
 
 [PackageTemplates]
 template_dirs:          pkg_tools
diff --git a/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-online-conf b/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-online-conf
new file mode 100644
index 000000000..6ada4b978
--- /dev/null
+++ b/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-online-conf
@@ -0,0 +1,47 @@
+#############################################################################
+##
+## Copyright (C) 2019 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.qtcreatorcdbext]
+archives:               tools.qtcreatorcdbext32,
+                        tools.qtcreatorcdbext64
+target_install_base:    /Tools/QtCreator
+package_default:        true
+
+[tools.qtcreatorcdbext32]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/qtcreatorcdbext.7z
+package_strip_dirs:     0
+target_install_dir:     /
+rpath_target:
+archive_name:           qtcreatorcdbext32.7z
+
+[tools.qtcreatorcdbext64]
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/qtcreatorcdbext.7z
+package_strip_dirs:     0
+target_install_dir:     /
+rpath_target:
+archive_name:           qtcreatorcdbext64.7z
diff --git a/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-msvc2015-standalone-conf b/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-standalone-conf
index 66bfe87bd..77f0479ba 100644
--- a/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-msvc2015-standalone-conf
+++ b/packaging-tools/configurations/windows/all/tools-qtcreatorcdbext-standalone-conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the release tools of the Qt Toolkit.
@@ -33,14 +33,14 @@ target_install_base:    /
 package_default:        true
 
 [tools.qtcreatorcdbext32]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_32/qtcreatorcdbext.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/qtcreatorcdbext.7z
 package_strip_dirs:     0
 target_install_dir:     /
 rpath_target:
 archive_name:           qtcreatorcdbext32.7z
 
 [tools.qtcreatorcdbext64]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_64/qtcreatorcdbext.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/qtcreatorcdbext.7z
 package_strip_dirs:     0
 target_install_dir:     /
 rpath_target:
diff --git a/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-msvc2015-conf b/packaging-tools/configurations/windows/x64/x64-tools-qtcreator-standalone-conf
index 43c3d2221..7f0698e50 100644
--- a/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-msvc2015-conf
+++ b/packaging-tools/configurations/windows/x64/x64-tools-qtcreator-standalone-conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the release tools of the Qt Toolkit.
@@ -36,28 +36,28 @@ target_install_base:    /
 package_default:        true
 
 [tools.qtcreator]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_32/qtcreator.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/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
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/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
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/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
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/sdktool.7z
 package_strip_dirs:
 target_install_dir:     /bin
 rpath_target:
diff --git a/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-online-conf b/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-online-conf
index c412712de..fc408f2bc 100644
--- a/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-online-conf
+++ b/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-online-conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2019 Digia Plc and/or its subsidiary(-ies).
 ## Contact: http://www.qt-project.org/legal
 ##
 ## This file is part of the release tools of the Qt Toolkit.
@@ -49,28 +49,28 @@ target_install_base:    /Tools/QtCreator
 package_default:        true
 
 [tools.qtcreator]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_32/qtcreator.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/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
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/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
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/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
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/sdktool.7z
 package_strip_dirs:
 target_install_dir:     /bin
 rpath_target:
diff --git a/packaging-tools/configurations/windows/x64/x64-tools-qtcreator-msvc2015-conf b/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-standalone-conf
index 3769b5ae6..451c6342c 100644
--- a/packaging-tools/configurations/windows/x64/x64-tools-qtcreator-msvc2015-conf
+++ b/packaging-tools/configurations/windows/x86/x86-tools-qtcreator-standalone-conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the release tools of the Qt Toolkit.
@@ -36,28 +36,28 @@ target_install_base:    /
 package_default:        true
 
 [tools.qtcreator]
-archive_uri:            %QT_CREATOR_BASE_PATH%/windows_vs2015_64/qtcreator.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/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
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/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
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x64/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_64/sdktool.7z
+archive_uri:            %QT_CREATOR_BASE_PATH%/windows_msvc2017_x86/sdktool.7z
 package_strip_dirs:
 target_install_dir:     /bin
 rpath_target: