aboutsummaryrefslogtreecommitdiffstats
path: root/coin/pre-provisioning/qtci-windows-10-x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'coin/pre-provisioning/qtci-windows-10-x86_64')
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps140
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps140
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps140
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt2
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt2
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt2
6 files changed, 9 insertions, 117 deletions
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1
index fd7870c2..bb449e56 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-defragment.ps1
@@ -1,41 +1,5 @@
-#############################################################################
-##
-## Copyright (C) 2019 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## 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 Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## 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-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# Copyright (C) 2019 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
# thus needing its own version.
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1
index ef44e6d4..17b30db0 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1
@@ -1,41 +1,5 @@
-###########################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## 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 Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## 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-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# Copyright (C) 2020 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# Turning off win defender.
#
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1
index 37150fc2..62e19814 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windows-updates.ps1
@@ -1,41 +1,5 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## 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 Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## 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-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# Copyright (C) 2017 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# This script disables the automatic Windows updates
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt
index c4714602..8ee31abf 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt
@@ -15,4 +15,4 @@ $installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_insta
# -Visual Studio Extensibility Tools Update 3
# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
-$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"
+$sdk_installer = "http://ci-files01-hki.ci.qt.io/input/windows/sdksetup.exe"
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
index c63fcd50..b9713a49 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
@@ -7,7 +7,7 @@ $installer = "http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__5050
MSVC 2019 build tools (default installation, no additional selections).
* Install after MSVC2019 is installed!
- * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+ * Installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
* Version: 16.8.1
Installed MSVC-2019 Components:
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt
index 3e5a3ea0..e6ec797d 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt
@@ -19,7 +19,7 @@ have a VirtIO device installed, and we can't boot with a VirtIO device before
the driver is installed, we have to blindly install the registry entries:
* Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
- cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
+ cache: http://ci-files01-hki.ci.qt.io/input/windows/virtio/vioscsi.reg
However, we've seen that the Owner in the registry can be wrong. This entry
sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has