Merge remote-tracking branch 'origin/5.9' into 5.9.3

Change-Id: I2bb4b5d5b507c6586a9f9f7f2765d5f102ad180b

3 files changed, 6 insertions, 66 deletions

diff --git a/coin/provisioning/common/disable-ntp.ps1 b/coin/provisioning/common/disable-ntp.ps1
new file mode 100644
index 00000000..4ec9d1bd
--- /dev/null
+++ b/coin/provisioning/common/disable-ntp.ps1
@@ -0,0 +1,2 @@
+# Disable the NTP from syncing
+w32tm /config /syncfromflags:NO
diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1
deleted file mode 100644
index 50f12c89..00000000
--- a/coin/provisioning/common/install-java.ps1
+++ /dev/null
@@ -1,62 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts 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$
-##
-#############################################################################
-
-. "$PSScriptRoot\..\common\helpers.ps1"
-
-# This script will install Java RE
-# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only.
-
-$installdir = "C:\Program Files\Java\jre7"
-
-$version = "7u7"
-if( (is64bitWinHost) -eq 1 ) {
-    $arch = "x64"
-    $sha1 = "9af03460c416931bdee18c2dcebff5db50cb8cb3"
-}
-else {
-    $arch = "i586"
-    $sha1 = "f76b1be20b144b1ee1d1de3255edb0a6b57d0219"
-}
-
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-" + $arch + ".exe"
-$javaPackage = "C:\Windows\Temp\java-$version.exe"
-
-Copy-Item $url_cache $javaPackage
-cmd /c "$javaPackage /s SPONSORS=0"
-echo "Cleaning $javaPackage.."
-Remove-Item -Recurse -Force "$javaPackage"
-
-[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine)
-Add-Path "$installdir\bin"
-
-echo "Java = $version $arch" >> ~\versions.txt
diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/qnx_700.sh
index 0b17a7a0..1f1c0f3f 100644
--- a/coin/provisioning/common/qnx_700.sh
+++ b/coin/provisioning/common/qnx_700.sh
@@ -35,18 +35,18 @@
 
 # This script installs QNX 7.
 
-set -e
+set -ex
 targetFolder="/opt/"
 sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz"
 sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
 folderName="qnx700"
 targetFile="qnx700.tar.xz"
-wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" || echo "Failed to download '$url' multiple times"
-echo "$sha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile"
+echo "$sha1  $targetFile" | sha1sum --check
 if [ ! -d "$targetFolder" ]; then
   mkdir -p $targetFolder
 fi
-sudo tar -C $targetFolder -Jxf $targetFile|| echo "Failed to extract $targetFile"
+sudo tar -C $targetFolder -Jxf $targetFile
 sudo chown -R qt:users "$targetFolder"/"$folderName"
 
 # Verify that we have last file in tar