Provisioning: Windows: Security update for QNX 660 package

BlackBerry has released security updates for QNX 7.0.0 and 6.6.0 that
we want to include in CI since out customers will most likely have them
installed.

Task-number: QTQAINFRA-1535
Change-Id: I5b6a0995cb9ebc7b9596b44644795920461f6f42
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

3 files changed, 1 insertions, 53 deletions

diff --git a/coin/provisioning/common/windows/install-qnx660.ps1 b/coin/provisioning/common/windows/install-qnx660.ps1
index bf9c9d09..6114461e 100644
--- a/coin/provisioning/common/windows/install-qnx660.ps1
+++ b/coin/provisioning/common/windows/install-qnx660.ps1
@@ -38,7 +38,7 @@
 $version = "6.6.0"
 $nondottedversion = $version -replace '[.]',''
 $targetFolder = "c:"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + "-patch4687-windows.zip"
 
 Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"}
 
diff --git a/coin/provisioning/common/windows/patch_qnx.ps1 b/coin/provisioning/common/windows/patch_qnx.ps1
deleted file mode 100644
index 632859a0..00000000
--- a/coin/provisioning/common/windows/patch_qnx.ps1
+++ /dev/null
@@ -1,51 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## 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 http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://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 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# Patch QNX SDK due to issues in the standard library.
-# The patches are available here:
-# http://www.qnx.com/download/feature.html?programid=27555
-# A copy of the patch must be in the root of the Coin path in
-# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
-
-
-. "$PSScriptRoot\helpers.ps1"
-
-$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip"
-$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565"
-$tempDir = "C:\temp\qnx_path"
-
-Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
-Verify-Checksum $zip $sha1
-Extract-Zip $zip $tempDir
-Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force
-Remove-Item $tempDir -recurse
diff --git a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1
deleted file mode 100644
index de486c97..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\patch_qnx.ps1"