Revert "Installer pkg template generator"

This is not used at all.

This reverts commit 92a70e46bcd27d1d077dcbcd995f50ad288a6f9b.

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

62 files changed, 0 insertions, 3840 deletions

diff --git a/.gitignore b/.gitignore
index 49bab9d8b..1ded96a18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,3 @@ Makefile
 /packaging-tools/qt-bld-dynamic
 /packaging-tools/qt-install-dynamic
 /packaging-tools/ifw-pkg
-/packaging-tools/pkg_generator_output
diff --git a/packaging-tools/configurations/pkg_templates/generator/5.10.0.txt b/packaging-tools/configurations/pkg_templates/generator/5.10.0.txt
deleted file mode 100644
index 962bdf2ff..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/5.10.0.txt
+++ /dev/null
@@ -1,184 +0,0 @@
-[common]
-qt_version:     5.10.0
-qt_version_tag: alpha
-qt_pkg_name:    qt5.5100
-qt5_branch:     dev
-
-[toolchains]
-list:           gcc_64,
-                clang_64,
-                win32_mingw53,
-                win32_msvc2015,
-                win64_msvc2013_64,
-                win64_msvc2015_64,
-                win64_msvc2017_64,
-                win64_msvc2015_winrt_armv7,
-                win64_msvc2015_winrt_x64,
-                win64_msvc2015_winrt_x86,
-                win64_msvc2017_winrt_armv7,
-                win64_msvc2017_winrt_x64,
-                win64_msvc2017_winrt_x86,
-                android_armv7,
-                android_x86,
-                ios,
-                qnx6_armv7,
-                qnx6_x86
-
-[split_binary_components]
-list:           qtcharts,
-                qtdatavis3d,
-                qtnetworkauth,
-                qtpurchasing,
-                qtquickcompiler,
-                qtremoteobjects,
-                qtscript,
-                qtvirtualkeyboard,
-                qtwebengine
-
-[split_binary_component_excludes]
-qtwebengine:    android_armv7,
-                android_x86,
-                ios,
-                win32_mingw53,
-                win64_msvc2015_winrt_armv7,
-                win64_msvc2015_winrt_x64,
-                win64_msvc2015_winrt_x86,
-                win64_msvc2017_winrt_armv7,
-                win64_msvc2017_winrt_x64,
-                win64_msvc2017_winrt_x86,
-                qnx6_armv7,
-                qnx6_x86
-
-[split_src_components]
-list:           qtscript,
-                qtwebengine
-
-
-[qtcharts]
-split_component_display_name:   Qt Charts
-split_component_description:    The Qt Charts API lets you easily create interactive and dynamic 2D charts using C++ and/or Qt Quick.
-
-[qtdatavis3d]
-split_component_display_name:   Qt Data Visualization
-split_component_description:    Qt Data Visualization is a module which provides a way to visualize data in 3D. There are C++ classes and QML types for displaying bar graphs, scatter graphs, surface graphs and ways of manipulating the 3D scene. In addition, the graphs are fully customizable with different themes.
-
-[qtnetworkauth]
-split_component_display_name:   Qt Network Authorization
-split_component_description:    Qt Network Authorization is an add-on library that enables Qt applications to use different web authentication systems.
-
-[qtpurchasing]
-split_component_display_name:   Qt Purchasing
-split_component_description:    Qt Purchasing. Cross-platform APIs for handling in-app purchases on Android, iOS and macOS.
-
-[qtquickcompiler]
-split_component_display_name:   Qt Quick Compiler
-split_component_description:    The Qt Quick Compiler takes dynamically loadable QML files and converts them into internal Qt code during the build. This improves load time, performance and hides the original QML file contents better in distribution.
-
-[qtremoteobjects]
-split_component_display_name:   Qt Remote Objects (TP)
-split_component_description:    Qt Remote Objects is an add-on library that provides an easy way to share Qt APIs between processes/devices.<br><br>The release of Qt Remote Objects with Qt 5.10 is a Technology Preview.
-
-[qtscript]
-split_component_display_name:   Qt Script (Deprecated)
-split_component_description:    Qt Script (Deprecated) Prebuilt Components.
-
-[qtvirtualkeyboard]
-split_component_display_name:   Qt Virtual Keyboard
-split_component_description:    The Qt Virtual Keyboard is a Qt Quick virtual keyboard that you can plug in to your platform or application. You can extend it with your own layouts and styles.
-
-[qtwebengine]
-split_component_display_name:   Qt WebEngine
-split_component_description:    The Qt WebEngine module integrates the fast moving Chromium web platform into Qt and provides a convenient API for both Qt Widgets and Qt Quick to utilize Chromium's web capabilities. Qt WebEngine takes full benefit of the whole Qt graphics stack integration allowing seamless mix and overlay of native Qt controls with web content and OpenGL shaders.
-
-
-
-[gcc_64]
-platforms:                      linux/x64
-target_install_base:            gcc_64
-artifact_configuration_name:    Linux-RHEL_7_2-GCC-Linux-RHEL_7_2-X86_64
-
-[clang_64]
-platforms:                      mac/x64
-target_install_base:            clang_64
-artifact_configuration_name:    MacOS-OSX_10_10-Clang-MacOS-OSX_10_10-X86_64
-
-[win32_mingw53]
-platforms:                      windows/x86
-target_install_base:            mingw53_32
-artifact_configuration_name:    Windows-Windows_7-Mingw53-Windows-Windows_7-X86
-
-[win32_msvc2015]
-platforms:                      windows/x86
-target_install_base:            msvc2015
-artifact_configuration_name:    Windows-Windows_10-MSVC2015-Windows-Windows_10-X86
-
-[win64_msvc2013_64]
-platforms:                      windows/x64
-target_install_base:            msvc2013_64
-artifact_configuration_name:    Windows-Windows_8_1-MSVC2013-Windows-Windows_8_1-X86_64
-
-[win64_msvc2015_64]
-platforms:                      windows/x64
-target_install_base:            msvc2015_64
-artifact_configuration_name:    Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64
-
-[win64_msvc2017_64]
-platforms:                      windows/x64
-target_install_base:            msvc2017_64
-artifact_configuration_name:    Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64
-
-[win64_msvc2015_winrt_armv7]
-platforms:                      windows/x64
-target_install_base:            winrt_armv7_msvc2015
-artifact_configuration_name:    Windows-Windows_10-MSVC2015-WinRT-WinRT_10-ARMv7
-
-[win64_msvc2015_winrt_x64]
-platforms:                      windows/x64
-target_install_base:            winrt_x64_msvc2015
-artifact_configuration_name:    Windows-Windows_10-MSVC2015-WinRT-WinRT_10-X86_64
-
-[win64_msvc2015_winrt_x86]
-platforms:                      windows/x64
-target_install_base:            winrt_x86_msvc2015
-artifact_configuration_name:    Windows-Windows_10-MSVC2015-WinRT-WinRT_10-X86
-
-[win64_msvc2017_winrt_armv7]
-platforms:                      windows/x64
-target_install_base:            winrt_armv7_msvc2017
-artifact_configuration_name:    Windows-Windows_10-MSVC2017-WinRT-WinRT_10-ARMv7
-
-[win64_msvc2017_winrt_x64]
-platforms:                      windows/x64
-target_install_base:            winrt_x64_msvc2017
-artifact_configuration_name:    Windows-Windows_10-MSVC2017-WinRT-WinRT_10-X86_64
-
-[win64_msvc2017_winrt_x86]
-platforms:                      windows/x64
-target_install_base:            winrt_x86_msvc2017
-artifact_configuration_name:    Windows-Windows_10-MSVC2017-WinRT-WinRT_10-X86
-
-[android_armv7]
-platforms:                      linux/x64, mac/x64, windows/x86
-target_install_base:            android_armv7
-artifact_configuration_name:    Linux-RHEL_7_2-GCC-Android-Android_ANY-ARMv7 MacOS-MacOS_10_12-GCC-Android-Android_ANY-ARMv7 Windows-Windows_7-Mingw53-Android-Android_ANY-ARMv7
-
-[android_x86]
-platforms:                      linux/x64, mac/x64, windows/x86
-target_install_base:            android_x86
-artifact_configuration_name:    Linux-RHEL_7_2-GCC-Android-Android_ANY-X86 MacOS-MacOS_10_12-GCC-Android-Android_ANY-X86 Windows-Windows_7-Mingw53-Android-Android_ANY-X86
-
-[ios]
-platforms:                      mac/x64
-target_install_base:            ios
-artifact_configuration_name:    MacOS-OSX_10_10-Clang-IOS-IOS_ANY-Multi
-
-[qnx6_armv7]
-platforms:                      linux/x64, windows/x86
-target_install_base:            qnx6_armv7
-artifact_configuration_name:    Linux-RHEL_6_6-GCC-QNX-QNX_660-ARMv7 Windows-Windows_7-Mingw53-QNX-QNX_660-ARMv7
-
-[qnx6_x86]
-platforms:                      linux/x64, windows/x86
-target_install_base:            qnx6_x86
-artifact_configuration_name:    Linux-RHEL_6_6-GCC-QNX-QNX_660-X86 Windows-Windows_7-Mingw53-QNX-QNX_660-X86
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/android_armv7/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/android_armv7/meta/installscript.qs
deleted file mode 100644
index 44a542167..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/android_armv7/meta/installscript.qs
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-    // add dynamic dependency for mingw530 TC for Android packages on Windows
-    if (installer.value("os") == "win") {
-        var mingw_tc_component = "qt.tools.win32_mingw530";
-        component.addDependency(mingw_tc_component);
-    }
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    var qmakeBinary = "";
-    var platform = "";
-    if (installer.value("os") == "x11") {
-        qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake";
-        platform = "linux";
-    }
-    if (installer.value("os") == "mac") {
-        qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake";
-        platform = "mac";
-    }
-    if (installer.value("os") == "win") {
-        qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-        platform = "windows";
-    }
-
-    var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-    addInitQtPatchOperation(component, platform, qtPath, qmakeBinary, "emb-arm-qt5");
-
-    if (installer.value("SDKToolBinary") == "")
-        return;
-
-    // add Qt into QtCreator
-    component.addOperation("Execute",
-                           ["@SDKToolBinary@", "addQt",
-                            "--id", component.name,
-                            "--name", "Qt %{Qt:Version} for Android armv7",
-                            "--type", "Qt4ProjectManager.QtVersion.Android",
-                            "--qmake", qmakeBinary,
-                            "UNDOEXECUTE",
-                            "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-    // patch/register docs and examples
-    var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    print("Register documentation and examples for: " + installationPath);
-    patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-    // patch qt edition
-    var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-    component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource");
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/android_armv7/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/android_armv7/meta/package.xml
deleted file mode 100644
index 876ba68be..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/android_armv7/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Android ARMv7</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for Android ARMv7</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>250</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/android_x86/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/android_x86/meta/installscript.qs
deleted file mode 100644
index 74f62ba41..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/android_x86/meta/installscript.qs
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-    // add dynamic dependency for mingw530 TC for Android packages on Windows
-    if (installer.value("os") == "win") {
-        var mingw_tc_component = "qt.tools.win32_mingw530";
-        component.addDependency(mingw_tc_component);
-    }
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    var qmakeBinary = "";
-    var platform = "";
-    if (installer.value("os") == "x11") {
-        qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake";
-        platform = "linux";
-    }
-    if (installer.value("os") == "mac") {
-        qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake";
-        platform = "mac";
-    }
-    if (installer.value("os") == "win") {
-        qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-        platform = "windows";
-    }
-
-    var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-    addInitQtPatchOperation(component, platform, qtPath, qmakeBinary, "emb-arm-qt5");
-
-    if (installer.value("SDKToolBinary") == "")
-        return;
-
-    // add Qt into QtCreator
-    component.addOperation("Execute",
-                           ["@SDKToolBinary@", "addQt",
-                            "--id", component.name,
-                            "--name", "Qt %{Qt:Version} for Android x86",
-                            "--type", "Qt4ProjectManager.QtVersion.Android",
-                            "--qmake", qmakeBinary,
-                            "UNDOEXECUTE",
-                            "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-    // patch/register docs and examples
-    var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    print("Register documentation and examples for: " + installationPath);
-    patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-    // patch qt edition
-    var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-    component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource");
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/android_x86/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/android_x86/meta/package.xml
deleted file mode 100644
index 91d0641ad..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/android_x86/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Android x86</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for Android x86</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>270</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/clang_64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/clang_64/meta/installscript.qs
deleted file mode 100644
index 6ba631501..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/clang_64/meta/installscript.qs
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-    if (installer.value("os") == "mac") {
-        var xcodeVersion = installer.execute("/usr/bin/xcodebuild", new Array("-version"))[0];
-        if (xcodeVersion) {
-            var version = xcodeVersion.replace( /\D+/g, '');
-            if (parseInt(version) >= parseInt(400) && parseInt(version) <= parseInt(500)) {
-                QMessageBox["warning"]("XcodeVersionError",
-                        qsTr("You need to update Xcode to latest version!"),
-                        qsTr("It is recommeneded to have Xcode version greater than 4.0.0 and smaller than 5.0.0 for Qt5.9 compilations with clang."));
-            }
-        }
-        else {
-            QMessageBox["warning"]("XcodeError",
-                qsTr("Xcode installation not found!"),
-                qsTr("You need to install Xcode version 5.0.0. Download Xcode from https://developer.apple.com/xcode\n"));
-        }
-    }
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-    try {
-        var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-        var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake";
-        addInitQtPatchOperation(component, "mac", qtPath, qmakeBinary, "qt5");
-
-        if (installer.value("SDKToolBinary") == "")
-            return;
-
-        component.addOperation("Execute",
-                               ["@SDKToolBinary@", "addQt",
-                                "--id", component.name,
-                                "--name", "Qt %{Qt:Version} clang 64bit",
-                                "--type", "Qt4ProjectManager.QtVersion.Desktop",
-                                "--qmake", qmakeBinary,
-                                "UNDOEXECUTE",
-                                "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-        var kitName = component.name + "_kit";
-        component.addOperation("Execute",
-                               ["@SDKToolBinary@", "addKit",
-                                "--id", kitName,
-                                "--name", "Desktop Qt %{Qt:Version} clang 64bit",
-                                "--Ctoolchain", "x86-macos-generic-mach_o-64bit",
-                                "--Cxxtoolchain", "x86-macos-generic-mach_o-64bit",
-                                "--qt", component.name,
-                                "--debuggerengine", "256", // DebuggerEngineType::LldbEngineType
-                                "--devicetype", "Desktop",
-                                "UNDOEXECUTE",
-                                "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-        // patch/register docs and examples
-        var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-        print("Register documentation and examples for: " + installationPath);
-        patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-        // patch qt edition
-        var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-        component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource");
-
-    } catch(e) {
-        print(e);
-    }
-}
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/clang_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/clang_64/meta/package.xml
deleted file mode 100644
index e892b7e99..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/clang_64/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>macOS</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for macOS</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>700</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/doc.base/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/doc.base/meta/installscript.qs
deleted file mode 100644
index b88e957d4..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/doc.base/meta/installscript.qs
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-    registerQtCreatorDocumentation(component, "%TARGET_INSTALL_DIR%");
-}
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/doc.base/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/doc.base/meta/package.xml
deleted file mode 100644
index 0070b1c9e..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/doc.base/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Qt %QT_VERSION% Documentation</DisplayName>
-    <Description>Qt %QT_VERSION% Documentation</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Script>installscript.qs</Script>
-    <Dependencies>qt.tools</Dependencies>
-    <Virtual>true</Virtual>
-    <SortingPriority>1</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/doc.split/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/doc.split/meta/installscript.qs
deleted file mode 100644
index b88e957d4..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/doc.split/meta/installscript.qs
+++ /dev/null
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-    registerQtCreatorDocumentation(component, "%TARGET_INSTALL_DIR%");
-}
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/doc.split/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/doc.split/meta/package.xml
deleted file mode 100644
index 4729de7e5..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/doc.split/meta/package.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Documentation for %QT_VERSION% components (%SPLIT_COMPONENT_PROJECT_NAME%)</DisplayName>
-    <Description>Documentation for %QT_VERSION% components (%SPLIT_COMPONENT_PROJECT_NAME%)</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Script>installscript.qs</Script>
-    <Virtual>true</Virtual>
-    <SortingPriority>1</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/examples.base/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/examples.base/meta/package.xml
deleted file mode 100644
index da25e93b6..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/examples.base/meta/package.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Qt %QT_VERSION% Examples</DisplayName>
-    <Description>Qt %QT_VERSION% Examples</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools</Dependencies>
-    <Virtual>true</Virtual>
-    <SortingPriority>1</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/examples.split/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/examples.split/meta/package.xml
deleted file mode 100644
index a5b3e4fa7..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/examples.split/meta/package.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Examples for %QT_VERSION% components (%SPLIT_COMPONENT_PROJECT_NAME%)</DisplayName>
-    <Description>Examples for %QT_VERSION% components (%SPLIT_COMPONENT_PROJECT_NAME%)</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Virtual>true</Virtual>
-    <SortingPriority>1</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/gcc_64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/gcc_64/meta/installscript.qs
deleted file mode 100644
index 6c75ddd64..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/gcc_64/meta/installscript.qs
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "x11") {
-        var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-        var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake";
-        addInitQtPatchOperation(component, "linux", qtPath, qmakeBinary, "qt5");
-
-        if (installer.value("SDKToolBinary") == "")
-            return;
-
-        component.addOperation("Execute",
-                               ["@SDKToolBinary@", "addQt",
-                                "--id", component.name,
-                                "--name", "Qt %{Qt:Version} GCC 64bit",
-                                "--type", "Qt4ProjectManager.QtVersion.Desktop",
-                                "--qmake", qmakeBinary,
-                                "UNDOEXECUTE",
-                                "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-        var kitName = component.name + "_kit";
-        component.addOperation("Execute",
-                               ["@SDKToolBinary@", "addKit",
-                                "--id", kitName,
-                                "--name", "Desktop Qt %{Qt:Version} GCC 64bit",
-                                "--Ctoolchain", "x86-linux-generic-elf-64bit",
-                                "--Cxxtoolchain", "x86-linux-generic-elf-64bit",
-                                "--qt", component.name,
-                                "--debuggerengine", "1",
-                                "--devicetype", "Desktop",
-                                "UNDOEXECUTE",
-                                "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-        // patch/register docs and examples
-        var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-        print("Register documentation and examples for: " + installationPath);
-        patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-        // is this OpenSource installation?
-        if (!isCommercialLicense()) {
-            // patch qt edition
-            var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-            component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/gcc_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/gcc_64/meta/package.xml
deleted file mode 100644
index e42826ade..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/gcc_64/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Desktop gcc 64-bit</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for Desktop gcc 64-bit</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>700</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/ios/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/ios/meta/installscript.qs
deleted file mode 100644
index 4e7ac3053..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/ios/meta/installscript.qs
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    var qmakeBinary = "";
-    var platform = "";
-    if (installer.value("os") == "mac") {
-        qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake";
-        platform = "mac";
-    }
-
-    var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-    addInitQtPatchOperation(component, platform, qtPath, qmakeBinary, "emb-arm-qt5");
-
-    if (installer.value("SDKToolBinary") == "")
-        return;
-
-    // add Qt into QtCreator
-    component.addOperation("Execute",
-                           ["@SDKToolBinary@", "addQt",
-                            "--id", component.name,
-                            "--name", "Qt %{Qt:Version} for iOS",
-                            "--type", "Qt4ProjectManager.QtVersion.Ios",
-                            "--qmake", qmakeBinary,
-                            "UNDOEXECUTE",
-                            "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-    // patch/register docs and examples
-    var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    print("Register documentation and examples for: " + installationPath);
-    patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-    // is this OpenSource installation?
-    if (!isCommercialLicense()) {
-        // patch qt edition
-        var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-        component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/ios/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/ios/meta/package.xml
deleted file mode 100644
index 2a7a3c939..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/ios/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>iOS</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for iOS</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>699</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_armv7/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_armv7/meta/installscript.qs
deleted file mode 100644
index 2f35c3b39..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_armv7/meta/installscript.qs
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-var Dir = new function () {
-    this.toNativeSparator = function (path) {
-        if (installer.value("os") == "win")
-            return path.replace(/\//g, '\\');
-        return path;
-    }
-};
-
-// constructor
-function Component()
-{
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    var platform = "";
-    var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake";
-    var sdpDirectoryPath = installer.value("QNX660_SDP_PATH");
-    var sdpQnxToolsExtension = "";
-
-    if (installer.value("os") == "x11") {
-        platform = "linux";
-    }
-    if (installer.value("os") == "win") {
-        platform = "windows";
-        sdpQnxToolsExtension = ".exe";
-    }
-
-    var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-    addInitQtPatchOperation(component, platform, qtPath, Dir.toNativeSparator(qmakeBinary + sdpQnxToolsExtension), "emb-arm-qt5");
-
-    if (installer.value("SDKToolBinary") == "")
-        return;
-
-    // add Qt to QtCreator
-    component.addOperation("Execute",
-                           ["@SDKToolBinary@", "addQt",
-                            "--id", component.name,
-                            "--name", "Qt %{Qt:Version} for QNX 6.6.0 armv7",
-                            "--type", "Qt4ProjectManager.QtVersion.QNX.QNX",
-                            "--qmake", Dir.toNativeSparator(qmakeBinary + sdpQnxToolsExtension),
-                            "SDKPath", "QString:" + Dir.toNativeSparator(sdpDirectoryPath),
-                            "UNDOEXECUTE",
-                            "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-    // add Kit to QtCreator
-    component.addOperation("Execute",
-                           ["@SDKToolBinary@", "addKit",
-                            "--id", component.name + ".kit",
-                            "--name", "Qt %{Qt:Version} for QNX 6.6.0 armv7",
-                            "--debuggerid", "opt_qnx660_debugger_armv7",
-                            "--devicetype", "QnxOsType",
-                            "--sysroot", Dir.toNativeSparator(sdpDirectoryPath + "/target/qnx6"),
-                            "--toolchain", "Qnx.QccToolChain:opt_qnx660_qcc_armv7",
-                            "--qt", component.name,
-                            "--mkspec", "qnx-armle-v7-qcc",
-                            "UNDOEXECUTE",
-                            "@SDKToolBinary@", "rmKit", "--id", component.name + ".kit"]);
-
-    // patch/register docs and examples
-    var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    print("Register documentation and examples for: " + installationPath);
-    patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_armv7/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_armv7/meta/package.xml
deleted file mode 100644
index 4bab210f2..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_armv7/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>QNX 6.6 armv7</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for QNX 6.6 armv7</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.qnx6.sdp.armv7, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>249</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_x86/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_x86/meta/installscript.qs
deleted file mode 100644
index a2aa0b838..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_x86/meta/installscript.qs
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-var Dir = new function () {
-    this.toNativeSparator = function (path) {
-        if (installer.value("os") == "win")
-            return path.replace(/\//g, '\\');
-        return path;
-    }
-};
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    var platform = "";
-    var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake";
-    var sdpDirectoryPath = installer.value("QNX660_SDP_PATH");
-    var sdpQnxToolsExtension = "";
-
-    if (installer.value("os") == "x11") {
-        platform = "linux";
-    }
-    if (installer.value("os") == "win") {
-        platform = "windows";
-        sdpQnxToolsExtension = ".exe";
-    }
-
-    var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-    addInitQtPatchOperation(component, platform, qtPath, Dir.toNativeSparator(qmakeBinary + sdpQnxToolsExtension), "emb-arm-qt5");
-
-    if (installer.value("SDKToolBinary") == "")
-        return;
-
-    // add Qt to QtCreator
-    component.addOperation("Execute",
-                           ["@SDKToolBinary@", "addQt",
-                            "--id", component.name,
-                            "--name", "Qt %{Qt:Version} for QNX 6.6.0 x86",
-                            "--type", "Qt4ProjectManager.QtVersion.QNX.QNX",
-                            "--qmake", Dir.toNativeSparator(qmakeBinary + sdpQnxToolsExtension),
-                            "SDKPath", "QString:" + Dir.toNativeSparator(sdpDirectoryPath),
-                            "UNDOEXECUTE",
-                            "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-    // add Kit to QtCreator
-    component.addOperation("Execute",
-                           ["@SDKToolBinary@", "addKit",
-                            "--id", component.name + ".kit",
-                            "--name", "Qt %{Qt:Version} for QNX 6.6.0 x86",
-                            "--debuggerid", "opt_qnx660_debugger_x86",
-                            "--devicetype", "QnxOsType",
-                            "--sysroot", Dir.toNativeSparator(sdpDirectoryPath + "/target/qnx6"),
-                            "--toolchain", "Qnx.QccToolChain:opt_qnx660_qcc_x86",
-                            "--qt", component.name,
-                            "--mkspec", "qnx-x86-qcc",
-                            "UNDOEXECUTE",
-                            "@SDKToolBinary@", "rmKit", "--id", component.name + ".kit"]);
-
-    // patch/register docs and examples
-    var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    print("Register documentation and examples for: " + installationPath);
-    patchQtExamplesAndDoc(component, installationPath, "%QT_VERSION%");
-
-    // is this OpenSource installation?
-    if (!isCommercialLicense()) {
-        // patch qt edition
-        var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-        component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_x86/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_x86/meta/package.xml
deleted file mode 100644
index 2a9f0df94..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/qnx6_x86/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>QNX 6.6 x86</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for QNX 6.6 x86</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.qnx6.sdp.x86, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>248</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/qt.qt_version/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/qt.qt_version/meta/installscript.qs
deleted file mode 100644
index 27da5f0a0..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/qt.qt_version/meta/installscript.qs
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-    // Determine if this is a online snapshot build
-    var snapshotBuild = false;
-    var isSnapshotStr = "%ONLINE_SNAPSHOT_BUILD%";
-    if (['true', 'yes', '1'].indexOf(isSnapshotStr) >= 0)
-        snapshotBuild = true;
-
-    if (snapshotBuild) {
-        // Indicate in DisplayName and Description that this is a snapshot build
-        var displayName = component.value("DisplayName");
-        var description = component.value("Description");
-        component.setValue("DisplayName", displayName + " %QT_RELEASE_TAG% snapshot (#%BUILD_NUMBER%)")
-        component.setValue("Description", description + " %QT_RELEASE_TAG% snapshot (#%BUILD_NUMBER%)")
-    }
-
-    if ((installer.value("os") == "win")
-            && !installer.isOfflineOnly()) {
-        // Enable the right toolchains
-        var msvc2013 = !!installer.environmentVariable("VS120COMNTOOLS");
-        var msvc2015 = !!installer.environmentVariable("VS140COMNTOOLS");
-
-        var android_armv7 = installer.componentByName("qt.qt5.5100.android_armv7");
-        var msvc2015_winrt_armv7 = installer.componentByName("qt.qt5.5100.win64_msvc2015_winrt_armv7");
-        var msvc2015_winrt_x64 = installer.componentByName("qt.qt5.5100.win64_msvc2015_winrt_x64");
-        var msvc2015_winrt_x86 = installer.componentByName("qt.qt5.5100.win64_msvc2015_winrt_x86");
-
-        // first reset the latest Qt5.x.x package default values to false
-        installer.componentByName("qt.qt5.5100.win32_mingw53").setValue("Default", "false");
-        installer.componentByName("qt.qt5.5100.win64_msvc2013_64").setValue("Default", "false");
-        installer.componentByName("qt.qt5.5100.win32_msvc2015").setValue("Default", "false");
-        installer.componentByName("qt.qt5.5100.win64_msvc2015_64").setValue("Default", "false");
-
-        if (android_armv7)
-            android_armv7.setValue("Default", "false");
-        if (msvc2015_winrt_armv7)
-            msvc2015_winrt_armv7.setValue("Default", "false");
-        if (msvc2015_winrt_x64)
-            msvc2015_winrt_x64.setValue("Default", "false");
-        if (msvc2015_winrt_x86)
-            msvc2015_winrt_x86.setValue("Default", "false");
-
-        if (!snapshotBuild) {
-            // if 32bit windows hide the 64bit packages
-            if (installer.environmentVariable("ProgramFiles(x86)") == "" ) {
-                installer.componentByName("qt.qt5.5100.win64_msvc2013_64").setValue("Virtual", "true");
-                installer.componentByName("qt.qt5.5100.win64_msvc2015_64").setValue("Virtual", "true");
-            }
-
-            // now try to determine which tool chains to select by default
-            if (msvc2013) {
-                // if 64bit machine
-                if (!(installer.environmentVariable("ProgramFiles(x86)") == "")) {
-                    installer.componentByName("qt.qt5.5100.win64_msvc2013_64").setValue("Default", "true");
-                }
-            }
-            if (msvc2015) {
-                // if 64bit machine
-                if (!(installer.environmentVariable("ProgramFiles(x86)") == "")) {
-                    installer.componentByName("qt.qt5.5100.win64_msvc2015_64").setValue("Default", "true");
-                } else {
-                    installer.componentByName("qt.qt5.5100.win32_msvc2015").setValue("Default", "true");
-                }
-            }
-
-            // if no msvc toolkits detected, choose mingw by default
-            if (!msvc2013 && !msvc2015) {
-                installer.componentByName("qt.qt5.5100.win32_mingw53").setValue("Default", "true");
-            }
-        }
-    }
-}
-
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/qt.qt_version/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/qt.qt_version/meta/package.xml
deleted file mode 100644
index 57de19eda..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/qt.qt_version/meta/package.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Qt %QT_VERSION%</DisplayName>
-    <Description>Qt %QT_VERSION%</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Script>installscript.qs</Script>
-    <SortingPriority>%QT_VERSION_PKG_SORTING_PRIO%</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/qt/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/qt/meta/installscript.qs
deleted file mode 100644
index 31620ec94..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/qt/meta/installscript.qs
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-    installer.setValue("QT_EDITION_NAME", "Qt %QT_VERSION%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/qt/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/qt/meta/package.xml
deleted file mode 100644
index dd76a5831..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/qt/meta/package.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Qt %QT_VERSION% %QT_VERSION_TAG%</DisplayName>
-    <Description>Qt %QT_VERSION% %QT_VERSION_TAG%</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Script>installscript.qs</Script>
-    <SortingPriority>0</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/split.basetemplate/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/split.basetemplate/meta/package.xml
deleted file mode 100644
index 8a6595e48..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/split.basetemplate/meta/package.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>%SPLIT_COMPONENT_DISPLAY_NAME%</DisplayName>
-    <Description>%SPLIT_COMPONENT_DESCRIPTION%</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Default>false</Default>
-    <SortingPriority>89</SortingPriority>
-    <Dependencies>qt.%BASE_DEPENDENCY_PKG_NAME%.doc.%SPLIT_COMPONENT_PROJECT_NAME%, qt.%BASE_DEPENDENCY_PKG_NAME%.examples.%SPLIT_COMPONENT_PROJECT_NAME%</Dependencies>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/split.toolchain/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/split.toolchain/meta/installscript.qs
deleted file mode 100644
index 57fcf8c40..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/split.toolchain/meta/installscript.qs
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-
-function resolveQt5EssentialsDependency()
-{
-    return "qt.%BASE_DEPENDENCY_PKG_NAME%.%TOOLCHAIN_PKG_NAME%" + "_qmakeoutput";
-}
-
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    var platform = "";
-    if (installer.value("os") == "x11") {
-        platform = "linux";
-    }
-    if (installer.value("os") == "win") {
-        platform = "windows";
-    }
-    if (installer.value("os") == "mac") {
-        platform = "mac";
-    }
-
-    component.addOperation("QtPatch",
-                            platform,
-                            "@TargetDir@" + "%TARGET_INSTALL_DIR%",
-                            "QmakeOutputInstallerKey=" + resolveQt5EssentialsDependency(),
-                            "%FILES_TO_PATCH_FILENAME%");
-}
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/split.toolchain/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/split.toolchain/meta/package.xml
deleted file mode 100644
index 26098cf5f..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/split.toolchain/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>%SPLIT_COMPONENT_DISPLAY_NAME% (%TOOLCHAIN_PKG_NAME%)</DisplayName>
-    <Description></Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <AutoDependOn>qt.%BASE_DEPENDENCY_PKG_NAME%.%SPLIT_COMPONENT_PROJECT_NAME%, qt.%BASE_DEPENDENCY_PKG_NAME%.%TOOLCHAIN_PKG_NAME%</AutoDependOn>
-    <Dependencies>qt.%BASE_DEPENDENCY_PKG_NAME%.%TOOLCHAIN_PKG_NAME%</Dependencies>
-    <Virtual>true</Virtual>
-    <Script>installscript.qs</Script>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/src.base/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/src.base/meta/package.xml
deleted file mode 100644
index f383d1314..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/src.base/meta/package.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Sources</DisplayName>
-    <Description>Qt %QT_VERSION% Source Components</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <SortingPriority>100</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/src.collection.template/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/src.collection.template/meta/package.xml
deleted file mode 100644
index 06a6f1dd8..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/src.collection.template/meta/package.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Qt %QT_VERSION% Collection for %COLLECTION_COMPONENT_NAME%</DisplayName>
-    <Description>Qt %QT_VERSION% Collection for %COLLECTION_COMPONENT_NAME%.</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>%COLLECTION_COMPONENT_DEPENDENCY_LIST%</Dependencies>
-    <Virtual>true</Virtual>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/src.split/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/src.split/meta/package.xml
deleted file mode 100644
index 268631cb3..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/src.split/meta/package.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Sources for %SPLIT_COMPONENT_PROJECT_NAME%</DisplayName>
-    <Description>Sources for %SPLIT_COMPONENT_PROJECT_NAME% %QT_VERSION%</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Virtual>true</Virtual>
-    <AutoDependOn>qt.%BASE_DEPENDENCY_PKG_NAME%.src</AutoDependOn>
-    <SortingPriority>8</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/template-conf b/packaging-tools/configurations/pkg_templates/generator/templates/template-conf
deleted file mode 100644
index 3ab43df2a..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/template-conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win32_mingw53/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win32_mingw53/meta/installscript.qs
deleted file mode 100644
index 652b15d3c..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win32_mingw53/meta/installscript.qs
+++ /dev/null
@@ -1,144 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    var minGwVersion = "5.3.0";
-
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH=" + component_root_path + "\\bin;" + installer.value("MINGW530_DIR") + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    //contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MinGW " + minGwVersion + " (32-bit)/Qt " + qtStringVersion + " for Desktop (MinGW " + minGwVersion + " 32 bit).lnk",
-                            "/A /Q /K " + batchFileName);
-    // Assistant
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/assistant.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MinGW " + minGwVersion + " (32-bit)/Assistant.lnk");
-
-    // Designer
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/designer.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MinGW " + minGwVersion + " (32-bit)/Designer.lnk");
-
-    // Linguist
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/linguist.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MinGW " + minGwVersion + " (32-bit)/Linguist.lnk");
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} MinGW 32bit",
-                                    "--type", "Qt4ProjectManager.QtVersion.Desktop",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Desktop Qt %{Qt:Version} MinGW 32bit",
-                                    "--Ctoolchain", "@MINGW530_TCID@" + ".gcc",
-                                    "--Cxxtoolchain", "@MINGW530_TCID@" + ".g++",
-                                    "--qt", component.name,
-                                    "--debuggerid", "@MINGW530_DBGID@",
-                                    "--devicetype", "Desktop",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win32_mingw53/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win32_mingw53/meta/package.xml
deleted file mode 100644
index 656fc67fc..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win32_mingw53/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>MinGW 5.3.0 32 bit</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for MinGW 5.3.0 32-bit</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.tools.win32_mingw530, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>590</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2013/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2013/meta/installscript.qs
deleted file mode 100644
index 025249083..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2013/meta/installscript.qs
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2013 (32-bit)/Qt " + qtStringVersion + " 32-bit for Desktop (MSVC 2013).lnk",
-                            "/A /Q /K " + batchFileName);
-    // Assistant
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/assistant.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2013 (32-bit)/Assistant.lnk");
-
-    // Designer
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/designer.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2013 (32-bit)/Designer.lnk");
-
-    // Linguist
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/linguist.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2013 (32-bit)/Linguist.lnk");
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} MSVC2013 32bit",
-                                    "--type", "Qt4ProjectManager.QtVersion.Desktop",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Desktop Qt %{Qt:Version} MSVC2013 32bit",
-                                    "--Ctoolchain", "x86-windows-msvc2013-pe-32bit",
-                                    "--Cxxtoolchain", "x86-windows-msvc2013-pe-32bit",
-                                    "--qt", component.name,
-                                    "--debuggerengine", "4",
-                                    "--devicetype", "Desktop",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // patch qt edition
-            var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-            component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource");
-
-        } catch( e ) {
-            print( e );
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2013/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2013/meta/package.xml
deleted file mode 100644
index 6d78ecf66..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2013/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>msvc2013 32-bit</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for msvc2013 32-bit</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>590</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2015/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2015/meta/installscript.qs
deleted file mode 100644
index 5dc860e99..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2015/meta/installscript.qs
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (32-bit)/Qt " + qtStringVersion + " 32-bit for Desktop (MSVC 2015).lnk",
-                            "/A /Q /K " + batchFileName);
-    // Assistant
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/assistant.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (32-bit)/Assistant.lnk");
-
-    // Designer
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/designer.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (32-bit)/Designer.lnk");
-
-    // Linguist
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/linguist.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (32-bit)/Linguist.lnk");
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} MSVC2015 32bit",
-                                    "--type", "Qt4ProjectManager.QtVersion.Desktop",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Desktop Qt %{Qt:Version} MSVC2015 32bit",
-                                    "--Ctoolchain", "x86-windows-msvc2015-pe-32bit",
-                                    "--Cxxtoolchain", "x86-windows-msvc2015-pe-32bit",
-                                    "--qt", component.name,
-                                    "--debuggerengine", "4",
-                                    "--devicetype", "Desktop",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2015/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2015/meta/package.xml
deleted file mode 100644
index ee91aa58a..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win32_msvc2015/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>msvc2015 32-bit</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for msvc2015 32-bit</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>588</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_64/meta/installscript.qs
deleted file mode 100644
index eaa290937..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_64/meta/installscript.qs
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2013 (64-bit)/Qt " + qtStringVersion + " 64-bit for Desktop (MSVC 2013).lnk",
-                            "/A /Q /K " + batchFileName);
-    // Assistant
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/assistant.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2013 (64-bit)/Assistant.lnk");
-
-    // Designer
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/designer.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2013 (64-bit)/Designer.lnk");
-
-    // Linguist
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/linguist.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2013 (64-bit)/Linguist.lnk");
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} MSVC2013 64bit",
-                                    "--type", "Qt4ProjectManager.QtVersion.Desktop",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Desktop Qt %{Qt:Version} MSVC2013 64bit",
-                                    "--Ctoolchain", "x86-windows-msvc2013-pe-64bit",
-                                    "--Cxxtoolchain", "x86-windows-msvc2013-pe-64bit",
-                                    "--qt", component.name,
-                                    "--debuggerengine", "4",
-                                    "--devicetype", "Desktop",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_64/meta/package.xml
deleted file mode 100644
index 209272f5d..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_64/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>msvc2013 64-bit</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for msvc2013 64-bit</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>588</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_arm/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_arm/meta/installscript.qs
deleted file mode 100644
index 84c01ba16..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_arm/meta/installscript.qs
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2013 (32-bit)/Qt " + qtStringVersion + " 32-bit for Windows Phone arm (MSVC 2013).lnk",
-                            "/A /Q /K " + batchFileName);
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "emb-arm-qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} for Windows Phone arm",
-                                    "--type", "WinRt.QtVersion.WindowsPhone",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Qt %{Qt:Version} for Windows Phone arm MSVC2013 32bit",
-                                    "--toolchain", "arm-windows-msvc2013-pe-32bit",
-                                    "--qt", component.name,
-                                    "--devicetype", "WinRt.Device.Phone",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-        if (installer.value("os") == "win") {
-            var settingsFile = installer.value("QtCreatorInstallerSettingsFile");
-            if (settingsFile == "")
-                return;
-            component.addOperation("Settings", "path="+settingsFile, "method=add_array_value",
-            "key=Plugins/ForceEnabled", "value=WinRt");
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_arm/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_arm/meta/package.xml
deleted file mode 100644
index be202b83b..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_arm/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Windows Phone ARM (MSVC2013)</DisplayName>
-    <Description>License options: LGPLv3, GPLv2.0 or later, Commercial&lt;br&gt;&lt;br&gt;NOTE: Not licensed under LGPLv2.1&lt;br&gt;&lt;br&gt;Qt %QT_VERSION% Prebuilt Components for Windows Phone ARM</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>true</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>560</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_x86/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_x86/meta/installscript.qs
deleted file mode 100644
index c90e7643c..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_x86/meta/installscript.qs
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2013 (32-bit)/Qt " + qtStringVersion + " 32-bit for Windows Phone x86 (MSVC 2013).lnk",
-                            "/A /Q /K " + batchFileName);
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} for Windows Phone x86 (Emulator)",
-                                    "--type", "WinRt.QtVersion.WindowsPhone",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Qt %{Qt:Version} for Windows Phone x86 MSVC2013 32bit (Emulator)",
-                                    "--toolchain", "x86-windows-msvc2013-pe-32bit",
-                                    "--qt", component.name,
-                                    "--devicetype", "WinRt.Device.Emulator",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-        if (installer.value("os") == "win") {
-            var settingsFile = installer.value("QtCreatorInstallerSettingsFile");
-            if (settingsFile == "")
-                return;
-            component.addOperation("Settings", "path="+settingsFile, "method=add_array_value",
-            "key=Plugins/ForceEnabled", "value=WinRt");
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_x86/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_x86/meta/package.xml
deleted file mode 100644
index e7b597c4a..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2013_winphone_x86/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Windows Phone x86 (MSVC2013)</DisplayName>
-    <Description>License options: LGPLv3, GPLv2.0 or later, Commercial&lt;br&gt;&lt;br&gt;NOTE: Not licensed under LGPLv2.1&lt;br&gt;&lt;br&gt;Qt %QT_VERSION% Prebuilt Components for Windows Phone x86 Emulator</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>true</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>560</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_64/meta/installscript.qs
deleted file mode 100644
index 8ee038fb0..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_64/meta/installscript.qs
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (64-bit)/Qt " + qtStringVersion + " 64-bit for Desktop (MSVC 2015).lnk",
-                            "/A /Q /K " + batchFileName);
-    // Assistant
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/assistant.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (64-bit)/Assistant.lnk");
-
-    // Designer
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/designer.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (64-bit)/Designer.lnk");
-
-    // Linguist
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/linguist.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (64-bit)/Linguist.lnk");
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} MSVC2015 64bit",
-                                    "--type", "Qt4ProjectManager.QtVersion.Desktop",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Desktop Qt %{Qt:Version} MSVC2015 64bit",
-                                    "--Ctoolchain", "x86-windows-msvc2015-pe-64bit",
-                                    "--Cxxtoolchain", "x86-windows-msvc2015-pe-64bit",
-                                    "--qt", component.name,
-                                    "--debuggerengine", "4",
-                                    "--devicetype", "Desktop",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_64/meta/package.xml
deleted file mode 100644
index 94a489f9e..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_64/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>msvc2015 64-bit</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for msvc2015 64-bit</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>588</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_armv7/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_armv7/meta/installscript.qs
deleted file mode 100644
index 91b85cc7f..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_armv7/meta/installscript.qs
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (64-bit)/Qt " + qtStringVersion + " 64-bit for Universal Windows Platform armv7 (MSVC 2015).lnk",
-                            "/A /Q /K " + batchFileName);
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "emb-arm-qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} for UWP armv7 (MSVC 2015)",
-                                    "--type", "WinRt.QtVersion.WindowsRuntime",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Qt %{Qt:Version} for UWP armv7 (MSVC 2015)",
-                                    "--Ctoolchain", "arm-windows-msvc2015-pe-32bit",
-                                    "--Cxxtoolchain", "arm-windows-msvc2015-pe-32bit",
-                                    "--qt", component.name,
-                                    "--devicetype", "WinRt.Device.Phone",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-        if (installer.value("os") == "win") {
-            var settingsFile = installer.value("QtCreatorInstallerSettingsFile");
-            if (settingsFile == "")
-                return;
-            component.addOperation("Settings", "path="+settingsFile, "method=add_array_value",
-            "key=Plugins/ForceEnabled", "value=WinRt");
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_armv7/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_armv7/meta/package.xml
deleted file mode 100644
index 606d0f012..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_armv7/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>UWP armv7 (MSVC2015)</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for Universal Windows Platform</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>590</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x64/meta/installscript.qs
deleted file mode 100644
index 2cb52672e..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x64/meta/installscript.qs
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (64-bit)/Qt " + qtStringVersion + " 64-bit for Universal Windows Platform (MSVC 2015).lnk",
-                            "/A /Q /K " + batchFileName);
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "emb-arm-qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} for UWP 64bit (MSVC 2015)",
-                                    "--type", "WinRt.QtVersion.WindowsRuntime",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Qt %{Qt:Version} for UWP 64bit (MSVC 2015)",
-                                    "--Ctoolchain", "x86-windows-msvc2015-pe-64bit",
-                                    "--Cxxtoolchain", "x86-windows-msvc2015-pe-64bit",
-                                    "--qt", component.name,
-                                    "--debuggerengine", "4",
-                                    "--devicetype", "WinRt.Device.Local",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-        if (installer.value("os") == "win") {
-            var settingsFile = installer.value("QtCreatorInstallerSettingsFile");
-            if (settingsFile == "")
-                return;
-            component.addOperation("Settings", "path="+settingsFile, "method=add_array_value",
-            "key=Plugins/ForceEnabled", "value=WinRt");
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x64/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x64/meta/package.xml
deleted file mode 100644
index 7c465290c..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x64/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>UWP x64 (MSVC2015)</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for Universal Windows Platform</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>590</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x86/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x86/meta/installscript.qs
deleted file mode 100644
index 3bbb50fd7..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x86/meta/installscript.qs
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2015 (64-bit)/Qt " + qtStringVersion + " 64-bit for Universal Windows Platform 32bit (MSVC 2015).lnk",
-                            "/A /Q /K " + batchFileName);
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "emb-arm-qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} for UWP 32bit (MSVC 2015)",
-                                    "--type", "WinRt.QtVersion.WindowsRuntime",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Qt %{Qt:Version} for UWP 32bit (MSVC 2015)",
-                                    "--Ctoolchain", "x86-windows-msvc2015-pe-32bit",
-                                    "--Cxxtoolchain", "x86-windows-msvc2015-pe-32bit",
-                                    "--qt", component.name,
-                                    "--debuggerengine", "4",
-                                    "--devicetype", "WinRt.Device.Local",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-        if (installer.value("os") == "win") {
-            var settingsFile = installer.value("QtCreatorInstallerSettingsFile");
-            if (settingsFile == "")
-                return;
-            component.addOperation("Settings", "path="+settingsFile, "method=add_array_value",
-            "key=Plugins/ForceEnabled", "value=WinRt");
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x86/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x86/meta/package.xml
deleted file mode 100644
index 12dd8bef4..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2015_winrt_x86/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>UWP x86 (MSVC2015)</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for Universal Windows Platform</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>590</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_64/meta/installscript.qs
deleted file mode 100644
index 07b0c601f..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_64/meta/installscript.qs
+++ /dev/null
@@ -1,142 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2017 (64-bit)/Qt " + qtStringVersion + " 64-bit for Desktop (MSVC 2017).lnk",
-                            "/A /Q /K " + batchFileName);
-    // Assistant
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/assistant.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2017 (64-bit)/Assistant.lnk");
-
-    // Designer
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/designer.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2017 (64-bit)/Designer.lnk");
-
-    // Linguist
-    component.addOperation( "CreateShortcut",
-                            component_root_path + "/bin/linguist.exe",
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2017 (64-bit)/Linguist.lnk");
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} MSVC2017 64bit",
-                                    "--type", "Qt4ProjectManager.QtVersion.Desktop",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Desktop Qt %{Qt:Version} MSVC2017 64bit",
-                                    "--Ctoolchain", "x86-windows-msvc2017-pe-64bit",
-                                    "--Cxxtoolchain", "x86-windows-msvc2017-pe-64bit",
-                                    "--qt", component.name,
-                                    "--debuggerengine", "4",
-                                    "--devicetype", "Desktop",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_64/meta/package.xml
deleted file mode 100644
index 60a45de77..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_64/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>msvc2017 64-bit</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for msvc2017 64-bit</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>588</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_armv7/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_armv7/meta/installscript.qs
deleted file mode 100644
index 118bc583c..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_armv7/meta/installscript.qs
+++ /dev/null
@@ -1,134 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2017 (64-bit)/Qt " + qtStringVersion + " 64-bit for Universal Windows Platform armv7 (MSVC 2017).lnk",
-                            "/A /Q /K " + batchFileName);
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "emb-arm-qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} for UWP armv7 (MSVC 2017)",
-                                    "--type", "WinRt.QtVersion.WindowsRuntime",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Qt %{Qt:Version} for UWP armv7 (MSVC 2017)",
-                                    "--Ctoolchain", "arm-windows-msvc2017-pe-32bit",
-                                    "--Cxxtoolchain", "arm-windows-msvc2017-pe-32bit",
-                                    "--qt", component.name,
-                                    "--devicetype", "WinRt.Device.Phone",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-        if (installer.value("os") == "win") {
-            var settingsFile = installer.value("QtCreatorInstallerSettingsFile");
-            if (settingsFile == "")
-                return;
-            component.addOperation("Settings", "path="+settingsFile, "method=add_array_value",
-            "key=Plugins/ForceEnabled", "value=WinRt");
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_armv7/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_armv7/meta/package.xml
deleted file mode 100644
index 5d0012e4c..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_armv7/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>UWP armv7 (MSVC2017)</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for Universal Windows Platform</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>589</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x64/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x64/meta/installscript.qs
deleted file mode 100644
index 0fc3d70c9..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x64/meta/installscript.qs
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2017 (64-bit)/Qt " + qtStringVersion + " 64-bit for Universal Windows Platform (MSVC 2017).lnk",
-                            "/A /Q /K " + batchFileName);
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "emb-arm-qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} for UWP 64bit (MSVC 2017)",
-                                    "--type", "WinRt.QtVersion.WindowsRuntime",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Qt %{Qt:Version} for UWP 64bit (MSVC 2017)",
-                                    "--Ctoolchain", "x86-windows-msvc2017-pe-64bit",
-                                    "--Cxxtoolchain", "x86-windows-msvc2017-pe-64bit",
-                                    "--qt", component.name,
-                                    "--debuggerengine", "4",
-                                    "--devicetype", "WinRt.Device.Local",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-        if (installer.value("os") == "win") {
-            var settingsFile = installer.value("QtCreatorInstallerSettingsFile");
-            if (settingsFile == "")
-                return;
-            component.addOperation("Settings", "path="+settingsFile, "method=add_array_value",
-            "key=Plugins/ForceEnabled", "value=WinRt");
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x64/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x64/meta/package.xml
deleted file mode 100644
index c80a792a3..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x64/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>UWP x64 (MSVC2017)</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for Universal Windows Platform</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.%BASE_DEPENDENCY_PKG_NAME%.doc, qt.%BASE_DEPENDENCY_PKG_NAME%.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>589</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x86/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x86/meta/installscript.qs
deleted file mode 100644
index 29f329c3f..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x86/meta/installscript.qs
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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$
-**
-****************************************************************************/
-
-// constructor
-function Component()
-{
-}
-
-function isCommercialLicense()
-{
-    return installer.value("QT_LICENSE_TYPE").toUpperCase() == "ENTERPRISE";
-}
-
-function createShortcuts()
-{
-    var qtStringVersion = "%QT_VERSION%";
-    // Create a batch file with the development environment
-    var component_root_path = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-    component_root_path = component_root_path.replace(/\//g, "\\");
-
-    var batchFileName = component_root_path + "\\" + "bin" + "\\" + "qtenv2.bat";
-    var contentString = "@echo off\r\n";
-    contentString += "echo Setting up environment for Qt usage...\r\n";
-    contentString += "set PATH="  + component_root_path + "\\bin;%PATH%\r\n";
-    contentString += "cd /D " + component_root_path + "\r\n";
-    contentString += "echo Remember to call vcvarsall.bat to complete environment setup!\r\n";
-    // Dump batch file
-    component.addOperation("AppendFile", batchFileName, contentString);
-
-    var windir = installer.environmentVariable("WINDIR");
-    if (windir == "") {
-        QMessageBox["warning"]( "Error" , "Error", "Could not find windows installation directory");
-        return;
-    }
-
-    var cmdLocation = windir + "\\system32\\cmd.exe";
-    component.addOperation( "CreateShortcut",
-                            cmdLocation,
-                            "@StartMenuDir@/" + qtStringVersion + "/MSVC 2017 (64-bit)/Qt " + qtStringVersion + " 64-bit for Universal Windows Platform 32bit (MSVC 2017).lnk",
-                            "/A /Q /K " + batchFileName);
-}
-
-Component.prototype.beginInstallation = function()
-{
-    installer.setValue(component.name + "_qtpath", "@TargetDir@" + "%TARGET_INSTALL_DIR%");
-}
-
-Component.prototype.createOperations = function()
-{
-    component.createOperations();
-
-    if (installer.value("os") == "win") {
-        try {
-            var qtPath = "@TargetDir@" + "%TARGET_INSTALL_DIR%";
-            var qmakeBinary = "@TargetDir@" + "%TARGET_INSTALL_DIR%/bin/qmake.exe";
-            addInitQtPatchOperation(component, "windows", qtPath, qmakeBinary, "emb-arm-qt5");
-
-            // Create a batch file and shortcuts with the development environment
-            createShortcuts();
-
-            if (installer.value("SDKToolBinary") == "")
-                return;
-
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addQt",
-                                    "--id", component.name,
-                                    "--name", "Qt %{Qt:Version} for UWP 32bit (MSVC 2017)",
-                                    "--type", "WinRt.QtVersion.WindowsRuntime",
-                                    "--qmake", qmakeBinary,
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmQt", "--id", component.name]);
-
-            var kitName = component.name + "_kit";
-            component.addOperation("Execute",
-                                   ["@SDKToolBinary@", "addKit",
-                                    "--id", kitName,
-                                    "--name", "Qt %{Qt:Version} for UWP 32bit (MSVC 2017)",
-                                    "--Ctoolchain", "x86-windows-msvc2017-pe-32bit",
-                                    "--Cxxtoolchain", "x86-windows-msvc2017-pe-32bit",
-                                    "--qt", component.name,
-                                    "--debuggerengine", "4",
-                                    "--devicetype", "WinRt.Device.Local",
-                                    "UNDOEXECUTE",
-                                    "@SDKToolBinary@", "rmKit", "--id", kitName]);
-
-            // patch/register docs and examples
-            var installationPath = installer.value("TargetDir") + "%TARGET_INSTALL_DIR%";
-            print("Register documentation and examples for: " + installationPath);
-            patchQtExamplesAndDoc(component, installationPath, "Qt-%QT_VERSION%");
-
-            // is this OpenSource installation?
-            if (!isCommercialLicense()) {
-                // patch qt edition
-                var qconfigFile = qtPath + "/mkspecs/qconfig.pri";
-                component.addOperation("LineReplace", qconfigFile, "QT_EDITION =", "QT_EDITION = OpenSource"
-            }
-
-        } catch( e ) {
-            print( e );
-        }
-        if (installer.value("os") == "win") {
-            var settingsFile = installer.value("QtCreatorInstallerSettingsFile");
-            if (settingsFile == "")
-                return;
-            component.addOperation("Settings", "path="+settingsFile, "method=add_array_value",
-            "key=Plugins/ForceEnabled", "value=WinRt");
-        }
-    }
-}
-
diff --git a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x86/meta/package.xml b/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x86/meta/package.xml
deleted file mode 100644
index fd0e4bbf2..000000000
--- a/packaging-tools/configurations/pkg_templates/generator/templates/win64_msvc2017_winrt_x86/meta/package.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>UWP x86 (MSVC2017)</DisplayName>
-    <Description>Qt %QT_VERSION% Prebuilt Components for Universal Windows Platform</Description>
-    <Version>%QT_VERSION%-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Dependencies>qt.tools.qtcreator, qt.59.doc, qt.59.examples</Dependencies>
-    <Default>false</Default>
-    <Script>installscript.qs</Script>
-    <SortingPriority>589</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/pkg_gen.py b/packaging-tools/pkg_gen.py
deleted file mode 100644
index 58de9d5a9..000000000
--- a/packaging-tools/pkg_gen.py
+++ /dev/null
@@ -1,328 +0,0 @@
-#!/usr/bin/env python
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-
-import ConfigParser
-import os
-import shutil
-import argparse
-import re
-import bldinstallercommon
-import git  # pip install gitpython, pip install git+git://github.com/jkbr/httpie.git
-
-currentDir = os.path.dirname(os.path.abspath(__file__))
-
-
-class Pkg:
-
-    def __init__(self, qtVersion, toolchain, splitComponentList):
-        self.qtVersion = qtVersion
-        self.toolchain = toolchain
-        self.splitComponentList = splitComponentList
-
-
-
-def validateFile(filePath):
-    if not os.path.exists(filePath):
-        raise ValueError('The given path does not point into a file: ' % filePath)
-    else:
-        return open(filePath, 'r')  # return an open file handle
-
-
-def findAndReplaceText(directory, replacements):
-    for dname, dirs, files in os.walk(directory):
-        for fname in files:
-            fpath = os.path.join(dname, fname)
-            with open(fpath) as f:
-                s = f.read()
-            for find, replacement in replacements.iteritems():
-                s = s.replace(find, replacement)
-                with open(fpath, "w") as f:
-                    f.write(s)
-
-
-def trimAndSplit(value):
-    valueTrimmed = re.sub('\s+', ' ', value).replace(' ', '')
-    return valueTrimmed.split(",")
-
-
-def readValueAsList(configParser, section, key):
-    value = bldinstallercommon.safe_config_key_fetch(configParser, section, key)
-    return trimAndSplit(value.rstrip(","))
-
-
-def createSrcComponents(configParser, baseDir, pkgOutputBaseDirName, baseTemplate, splitTemplate, name, splitComponents, substitutionList):
-    componentList = []
-    srcBaseTemplateDir = os.path.join(currentDir, baseDir, "templates", baseTemplate)
-    srcBasePkg = 'qt' + '.' + qtPkgName + '.' + name  # e.g. qt.qt5.5100.[src|doc|examples]
-    destinationDir = os.path.join(pkgOutputBaseDirName, srcBasePkg)
-    shutil.copytree(srcBaseTemplateDir, destinationDir)
-    componentList.append(srcBasePkg)
-    print(srcBasePkg)
-    findAndReplaceText(destinationDir, substitutionList)
-    # split src
-    splitSrcBaseTemplateDir = os.path.join(currentDir, baseDir, "templates", splitTemplate)
-    for splitComponent in splitComponents:
-        splitSrcPkg = srcBasePkg + '.' + splitComponent
-        destinationDir = os.path.join(pkgOutputBaseDirName, splitSrcPkg)
-        shutil.copytree(splitSrcBaseTemplateDir, destinationDir)
-        componentList.append(splitSrcPkg)
-        print(splitSrcPkg)
-        # substitutions
-        splitSubstitutionList = {}
-        splitSubstitutionList["%SPLIT_COMPONENT_PROJECT_NAME%"] = splitComponent
-        findAndReplaceText(destinationDir, dict(substitutionList.items() + splitSubstitutionList.items()))
-    # create the collection components
-    collectionBaseTemplateDir = os.path.join(currentDir, baseDir, "templates", "src.collection.template")
-    collectionBasePkg = 'qt' + '.' + qtPkgName + '.' + name + '_' + 'collection'
-    destinationDir = os.path.join(pkgOutputBaseDirName, collectionBasePkg)
-    shutil.copytree(collectionBaseTemplateDir, destinationDir)
-    print(collectionBasePkg)
-    finalDependencyList = ", ".join(componentList)
-    collectionSubstitutionList = {}
-    collectionSubstitutionList["%COLLECTION_COMPONENT_DEPENDENCY_LIST%"] = finalDependencyList
-    collectionSubstitutionList["%COLLECTION_COMPONENT_NAME%"] = name
-    findAndReplaceText(destinationDir, dict(substitutionList.items() + collectionSubstitutionList.items()))
-
-
-class Progress(git.remote.RemoteProgress):
-    def update(self, op_code, cur_count, max_count=None, message=''):
-        print 'update(%s, %s, %s, %s)'%(op_code, cur_count, max_count, message)
-
-
-def parseGitModules(branch, checkoutDir):
-    import StringIO
-    # fetch qt5:.gitmodules
-    print("Reading remote qt5.git " + branch)
-    repo = git.Repo.init(checkoutDir)
-    origin = repo.create_remote('origin', "https://codereview.qt-project.org/qt/qt5.git")
-    origin.fetch(progress=Progress())
-    origin.pull(branch)
-    gitModulesFile = os.path.join(checkoutDir, ".gitmodules")
-    data = '\n'.join(line.strip(' \t\r') for line in open(gitModulesFile))
-    buf = StringIO.StringIO(data)
-    config = ConfigParser.ConfigParser()
-    config.readfp(buf)
-
-    print("")
-    modulesList = []
-    for section in config.sections():
-        if not section.startswith('submodule "'):
-            continue
-        module = section[len('submodule "'):][:-1]
-        status = config.get(section, 'status')
-        if not status or status in ["ignore"]:
-            print("Skipping module: " + module)
-            continue
-        modulesList.append(module)
-
-    return modulesList
-
-
-def generateConfFile(modulesList, splitBinList, outputDir, outputFileName, templateFile, rootComponentName, qtPkgName, tcName, targetInstallBase, qtVersion, artifactConfigurationName):
-    config = ConfigParser.ConfigParser()
-
-    mainBinarySectionName = rootComponentName + "." + qtPkgName + "." + tcName  # e.g. [qt.qt5.5100.gcc_64]
-    archivesList = ", ".join(modulesList)
-    installDir = '/' + qtVersion + '/' + targetInstallBase  # e.g. /%QT_VERSION%/gcc_64
-    config.add_section(mainBinarySectionName)
-    config.set(mainBinarySectionName, 'archives', archivesList)
-    config.set(mainBinarySectionName, 'target_install_base', installDir)
-    for module in modulesList:
-        config.add_section(module)
-        archiveUri = "/qt" + "/" + qtVersion + "/latest/" + module + "/" + module + "-" + artifactConfigurationName + ".7z"
-        config.set(module, 'archive_uri', archiveUri)
-
-    # split components
-    for item in splitBinList:
-        splitComponentBaseName = rootComponentName + "." + qtPkgName + "." + item  # e.g. [qt.qt5.5100.qtcharts]
-        config.add_section(splitComponentBaseName)
-        splitComponentTCName = splitComponentBaseName + "." + tcName
-        config.add_section(splitComponentTCName)
-        archiveComponentName = item + "." + tcName
-        config.set(splitComponentTCName, 'archives', archiveComponentName)
-        config.set(splitComponentTCName, 'target_install_base', installDir)
-        config.add_section(archiveComponentName)
-        splitArchiveUri = "/qt" + "/" + qtVersion + "/latest/" + item + "/" + item + "-" + artifactConfigurationName + ".7z"
-        config.set(archiveComponentName, 'archive_uri', splitArchiveUri)
-
-    if not os.path.exists(outputDir):
-        os.makedirs(outputDir)
-    shutil.copyfile(templateFile, outputFileName)
-    #print(outputFileName)
-    with open(outputFileName, "a") as f:
-        config.write(f)
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Process some integers.')
-    parser.add_argument('--input', required=True, help="Path to config file")
-    args = parser.parse_args()
-    if not os.path.isfile(args.input):
-        raise ValueError('The given path does not point into a file: ' % filePath)
-
-    configFile = open(args.input, 'r')
-    configParser = ConfigParser.ConfigParser()
-    configParser.readfp(configFile)
-
-    # base dir for pkg templates sources
-    baseDir = os.path.dirname(args.input)
-    qtVersion = bldinstallercommon.safe_config_key_fetch(configParser, 'common', 'qt_version')
-    qtVersionTag = bldinstallercommon.safe_config_key_fetch(configParser, 'common', 'qt_version_tag')
-    qtPkgName = bldinstallercommon.safe_config_key_fetch(configParser, 'common', 'qt_pkg_name')  # e.g. "59" or "qt5.5100"
-    qt5Branch = bldinstallercommon.safe_config_key_fetch(configParser, 'common', 'qt5_branch')
-    # output dir
-    outputBaseDirName = os.path.join(currentDir, "pkg_generator_output")
-    qt5CheckoutDir = os.path.join(outputBaseDirName, "qt5")
-    pkgOutputBaseDirName = os.path.join(outputBaseDirName, "pkg")
-    confFilesBaseOutputDir = os.path.join(outputBaseDirName, "configurations")
-    shutil.rmtree(outputBaseDirName, ignore_errors=True)
-    os.makedirs(pkgOutputBaseDirName)
-    os.makedirs(qt5CheckoutDir)
-    os.makedirs(confFilesBaseOutputDir)
-
-    # fetch qt5:.gitmodules
-    modules = parseGitModules(qt5Branch, qt5CheckoutDir)
-
-    # common key/value substitution list
-    commonSubstitutionList = {}
-    commonSubstitutionList["%QT_VERSION%"] = qtVersion
-    commonSubstitutionList["%QT_VERSION_TAG%"] = qtVersionTag
-    commonSubstitutionList["%BASE_DEPENDENCY_PKG_NAME%"] = qtPkgName
-    commonSubstitutionList["%QT_VERSION_PKG_SORTING_PRIO%"] = qtVersion.replace(".", "")
-
-    # split binary components
-    splitBinaryComponents = readValueAsList(configParser, 'split_binary_components', 'list')
-    # toolchains
-    toolchains = readValueAsList(configParser, 'toolchains', 'list')
-
-    # split excludes by toolchain
-    splitBinaryComponentsExcludeByTcKeys = bldinstallercommon.config_section_map(configParser, 'split_binary_component_excludes')
-    splitExcludeDict = {}
-    for key, value in splitBinaryComponentsExcludeByTcKeys.iteritems():
-        splitExcludeDict[key] = trimAndSplit(value)
-
-    # generate qt root component
-    finalPkgTemlateName = "qt"
-    qtRootPkgTemplate = os.path.join(currentDir, baseDir, "templates", "qt")
-    destinationDir = os.path.join(pkgOutputBaseDirName, finalPkgTemlateName)
-    shutil.copytree(qtRootPkgTemplate, destinationDir)
-    print(finalPkgTemlateName)
-
-    # generate qt.qt_version component
-    finalPkgTemlateName = "qt" + "." + qtPkgName
-    qtRootPkgTemplate = os.path.join(currentDir, baseDir, "templates", "qt.qt_version")
-    destinationDir = os.path.join(pkgOutputBaseDirName, finalPkgTemlateName)
-    shutil.copytree(qtRootPkgTemplate, destinationDir)
-    print(finalPkgTemlateName)
-
-    # generate toolchain pkg templates
-    for toolchain in toolchains:
-        pkgTemplateName = 'qt' + '.' + qtPkgName + '.' + toolchain
-        templateSourceDir = os.path.join(currentDir, baseDir, "templates", toolchain)
-        if not os.path.isdir(templateSourceDir):
-            raise Exception('The given path does not contain template sources: %s' % templateSourceDir)
-        destinationDir = os.path.join(pkgOutputBaseDirName, pkgTemplateName)
-        shutil.copytree(templateSourceDir, destinationDir)
-        print(pkgTemplateName)
-
-    # substitute before split components
-    findAndReplaceText(pkgOutputBaseDirName, commonSubstitutionList)
-
-    # generate plain split pkg templates
-    splitBaseTemplateDir = os.path.join(currentDir, baseDir, "templates", "split.basetemplate")  # e.g. qt.qt5.5100.qtcharts
-    splitTCTemplateDir = os.path.join(currentDir, baseDir, "templates", "split.toolchain")  # e.g. qt.qt5.5100.qtcharts.gcc_64
-    if not os.path.isdir(splitTCTemplateDir):
-        raise Exception('The given path does not contain template sources: %s' % splitTCTemplateDir)
-    for splitComponent in splitBinaryComponents:
-        # generate base split pkg template
-        splitPkgBase = 'qt' + '.' + qtPkgName + '.' + splitComponent
-        destinationDir = os.path.join(pkgOutputBaseDirName, splitPkgBase)
-        shutil.copytree(splitBaseTemplateDir, destinationDir)
-        print(splitPkgBase)
-        # substitutions
-        splitComponentSubstitutions = {}
-        splitComponentSubstitutions["%SPLIT_COMPONENT_PROJECT_NAME%"] = splitComponent
-        splitComponentSubstitutions["%SPLIT_COMPONENT_DISPLAY_NAME%"] = bldinstallercommon.safe_config_key_fetch(configParser, splitComponent, "split_component_display_name")
-        splitComponentSubstitutions["%SPLIT_COMPONENT_DESCRIPTION%"] = bldinstallercommon.safe_config_key_fetch(configParser, splitComponent, "split_component_description")
-        findAndReplaceText(destinationDir, dict(commonSubstitutionList.items() + splitComponentSubstitutions.items()))
-        # generate split components per toolchain
-        excludeList = splitExcludeDict.get(splitComponent, [])
-        for toolchain in toolchains:
-            if toolchain in excludeList:
-                continue
-            splitPkgTC = splitPkgBase + '.' + toolchain
-            destinationDir = os.path.join(pkgOutputBaseDirName, splitPkgTC)
-            shutil.copytree(splitTCTemplateDir, destinationDir)
-            print(splitPkgTC)
-            # TODO: substitute strings
-            splitComponentTCSubstitutions = {}
-            splitComponentTCSubstitutions['%TOOLCHAIN_PKG_NAME%'] = toolchain
-            filesToPatch = "qt5"
-            if re.findall(r'android|winrt|winphone|ios|qnx', toolchain):
-                filesToPatch = "emb-arm-qt5"
-            splitComponentTCSubstitutions['%FILES_TO_PATCH_FILENAME%'] = filesToPatch
-            findAndReplaceText(destinationDir, dict(commonSubstitutionList.items() + splitComponentSubstitutions.items() + splitComponentTCSubstitutions.items()))
-
-    # generate src components
-    substitutionList = {}
-    substitutionList["%QT_VERSION%"] = qtVersion
-    substitutionList["%BASE_DEPENDENCY_PKG_NAME%"] = qtPkgName
-    createSrcComponents(configParser, baseDir, pkgOutputBaseDirName, "src.base", "src.split", "src", readValueAsList(configParser, 'split_src_components', 'list'), substitutionList)
-    # generate doc components
-    substitutionList = {}
-    substitutionList["%QT_VERSION%"] = qtVersion
-    substitutionList["%SPLIT_COMPONENT_PROJECT_NAME%"] = qtVersion
-    createSrcComponents(configParser, baseDir, pkgOutputBaseDirName, "doc.base", "doc.split", "doc", splitBinaryComponents, substitutionList)
-    # generate examples components
-    substitutionList = {}
-    substitutionList["%QT_VERSION%"] = qtVersion
-    createSrcComponents(configParser, baseDir, pkgOutputBaseDirName, "examples.base", "examples.split", "examples", splitBinaryComponents, substitutionList)
-
-    print("")
-    print("Pkg templates generated into: " + pkgOutputBaseDirName)
-    print("")
-
-    rootComponent = "qt"
-    confFileTemplate = os.path.join(currentDir, baseDir, "templates", "template-conf")
-    for tc in toolchains:
-        supportedPlatforms = readValueAsList(configParser, tc, 'platforms')
-        for platform in ["linux/x64", "mac/x64", "windows/x64", "windows/x86"]:
-            if platform not in supportedPlatforms:
-                continue
-
-            outputDir = os.path.join(confFilesBaseOutputDir, platform)
-            targetInstallBase = bldinstallercommon.safe_config_key_fetch(configParser, tc, 'target_install_base')
-            artifactConfigurationName = bldinstallercommon.safe_config_key_fetch(configParser, tc, 'artifact_configuration_name')
-            # file name for the conf file
-            fileName = platform.replace("/", "_") + "-" + qtPkgName + "-" + tc
-            outputFileName = os.path.join(outputDir, fileName)
-            generateConfFile(modules, splitBinaryComponents, outputDir, outputFileName, confFileTemplate, rootComponent, qtPkgName, tc, targetInstallBase, qtVersion, artifactConfigurationName)
-
-