Update submodules on '5.9' in qt5

Change-Id: Ib3f84d5b2e24b827098d873016a012eb07ec18ca
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.9.8
+	branch = 5.9
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.9.8
+	branch = 5.9
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.9.8
+	branch = 5.9
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.9.8
+	branch = 5.9
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.9.8
+	branch = 5.9
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.9.8
+	branch = 5.9
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.9.8
+	branch = 5.9
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -121,27 +121,27 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
@@ -154,51 +154,51 @@
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.9.8
+	branch = 5.9
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -211,101 +211,101 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.9.8
+	branch = 5.9
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.9.8
+	branch = 5.9
 	status = preview
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	recommends = qtwebview
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.9.8
+	branch = 5.9
 	status = preview
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.9.8
+	branch = 5.9
 	status = preview

coin/platform_configs/default.txt

@@ -13,10 +13,10 @@ qtci-linux-openSUSE-42.3-x86_64                                     GCC
 qtci-linux-openSUSE-42.3-x86_64                                     ICC_18      DeveloperBuild NoPch DisableTests
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
 qtci-linux-RHEL-7.4-x86_64                                          GCC         Packaging Release NoUseGoldLinker
-qtci-macos-10.12-x86_64-8                                           Clang       Packaging DebugAndRelease Release
+qtci-macos-10.12-x86_64-9                                           Clang       Packaging DebugAndRelease Release
 qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch
 qtci-osx-10.10-x86_64                                               Clang       Release NoFramework DisableTests
-qtci-macos-10.12-x86_64-8           IOS_ANY             x86_64      Clang       Release DisableTests Static
+qtci-macos-10.12-x86_64-9           IOS_ANY             x86_64      Clang       Release DisableTests Static
 qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                armv7       GCC         Release
 qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                arm64       GCC         Release

coin/platform_configs/qt5.txt

@@ -12,10 +12,10 @@ qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017    Packagin
 qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-7-x86-3        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-9   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-9   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
 qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
+qtci-macos-10.12-x86_64-9   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
 qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-10   QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2

coin/provisioning/common/macos/install-commandlinetools.sh

@@ -49,7 +49,7 @@ function InstallCommandLineTools {
     hdiutil attach /tmp/$packageName
     cd "/Volumes/Command Line Developer Tools"
     echo "Installing"
-    sudo installer -verbose -pkg *.pkg -target /
+    sudo installer -pkg ./*.pkg -target / -allowUntrusted
     cd /
     # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
     sleep 3

coin/provisioning/common/macos/install_xcode_9_orHigher.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2019 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$
+##
+#############################################################################
+
+# This script installs Xcode
+# Prerequisites: Have Xcode prefetched to local cache as xz compressed.
+# This can be achieved by fetching Xcode_8.xip from Apple Store.
+# Uncompress it with 'xar -xf Xcode_8.xip'
+# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py
+# with which you can run 'python parse_pbzx2.py Content'.
+# This will give you a file called "Content.part00.cpio.xz" that
+# can be renamed to Xcode_8.xz for this script.
+
+
+
+function InstallXCode() {
+    sourceFile=$1
+    version=$2
+
+    echo "Uncompressing and installing '$sourceFile'"
+    if [[ $sourceFile =~ tar ]]; then
+        cd /Applications/ && sudo tar -zxf "$sourceFile"
+    else
+        xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
+    fi
+
+    echo "Versioning application bundle"
+    majorVersion=$(echo $version | cut -d '.' -f 1)
+    versionedAppBundle="/Applications/Xcode${majorVersion}.app"
+    sudo mv /Applications/Xcode.app ${versionedAppBundle}
+
+    echo "Selecting Xcode"
+    sudo xcode-select --switch ${versionedAppBundle}
+
+    echo "Accept license"
+    sudo xcodebuild -license accept
+
+    echo "Install packages"
+    # -runFirstLaunch is valid in 9.x
+    sudo xcodebuild -runFirstLaunch || true
+
+    echo "Enabling developer mode, so that using lldb does not require interactive password entry"
+    sudo /usr/sbin/DevToolsSecurity -enable
+
+    echo "Xcode = $version" >> ~/versions.txt
+}

coin/provisioning/common/unix/squishInstall.sh

@@ -38,7 +38,7 @@ set -ex
 # This script will install squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.3.0"
+version="6.5.1"
 # Branch version without dot
 qtBranch="59x"
 squishFolder="/opt/squish"

coin/provisioning/common/windows/android-openssl.ps1

@@ -39,31 +39,41 @@
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
 
-$version = "1.0.2p"
-$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
-$sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c"
-$destination = "C:\Utils\openssl-android-master"
-
-Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
-Verify-Checksum $zip $sha1
-
-Extract-7Zip $zip C:\Utils
-Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils
-Rename-Item C:\Utils\openssl-$version $destination
-Remove-Item -Path $zip
-Remove-Item C:\Utils\openssl-$version.tar
+# Android openssl was preconfigured manually. More info in jira ticket  https://bugreports.qt.io/browse/QTQAINFRA-3258
+# Android openssl was configured with following way and cached to ci-files01-hki.intra.qt.io\provisioning\openssl\.
+#################################################################
+## $version = "1.0.2p"
+## $zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
+## $sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c"
+## $destination = "C:\Utils\openssl-android-master"
+## Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
+## Verify-Checksum $zip $sha1
+## Extract-7Zip $zip C:\Utils
+## Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils
+## Rename-Item C:\Utils\openssl-$version $destination
+## Remove-Item -Path $zip
+## Remove-Item C:\Utils\openssl-$version.tar
+## Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
+## Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
+## Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr"
+### Make sure configure for openssl has a "make" and "perl" available
+## $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
+## Write-Host "Configuring OpenSSL $version for Android..."
+## Push-Location $destination
+## Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`""
+## Pop-Location
+### Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
+## C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
+#################################################################
 
 Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
 Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
 Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr"
 
-# Make sure configure for openssl has a "make" and "perl" available
-$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
-
-Write-Host "Configuring OpenSSL $version for Android..."
-Push-Location $destination
-Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`""
-Pop-Location
-
-# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
-# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
+$version = "1.0.2t"
+$zip = "c:\users\qt\downloads\openssl-$version.7z"
+$sha1 = "6670ff13906a04fdbfe0fcbc075ff21839dca984"
+Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master_$version.7z \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master_$version.7z $zip
+Verify-Checksum $zip $sha1
+Extract-7Zip $zip C:\Utils
+Remove-Item -Path $zip

coin/provisioning/common/windows/helpers.ps1

@@ -160,3 +160,22 @@ function isProxyEnabled {
 function getProxy {
     return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
 }
+
+function Remove {
+
+    Param (
+        [string]$Path = $(BadParam("a path"))
+    )
+    Write-Host "Removing $Path"
+    $i = 0
+    While ( Test-Path($Path) ){
+        Try{
+            remove-item -Force -Recurse -Path $Path -ErrorAction Stop
+        }catch{
+            $i +=1
+            if ($i -eq 5) {exit 1}
+            Write-Verbose "$Path locked, trying again in 5"
+            Start-Sleep -seconds 5
+        }
+    }
+}

coin/provisioning/common/windows/install-gnuwin32.ps1

@@ -0,0 +1,46 @@
+############################################################################
+##
+## Copyright (C) 2019 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\helpers.ps1"
+
+# This script will install gnuwin32
+
+$prog = "gnuwin32"
+$zipPackage = "$prog.zip"
+$temp = "$env:tmp"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
+$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
+Download $externalUrl $internalUrl "$temp\$zipPackage"
+Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
+Extract-7Zip "$temp\$zipPackage" C:\Utils
+
+Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt

coin/provisioning/common/windows/install-jdk.ps1

@@ -68,8 +68,7 @@ try {
 Verify-Checksum $javaPackage $sha1
 
 Run-Executable "$javaPackage" "/s SPONSORS=0"
-Write-Host "Cleaning $javaPackage.."
-Remove-Item -Recurse -Force -Path "$javaPackage"
+Remove "$javaPackage"
 
 Set-EnvironmentVariable "JAVA_HOME" "$installdir"
 Add-Path "$installdir\bin"

coin/provisioning/common/windows/openssl.ps1

@@ -36,7 +36,7 @@
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
-$version = "1_0_2p"
+$version = "1_0_2t"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 
@@ -47,7 +47,7 @@ if (Is64BitWinHost) {
     $installFolder = "C:\openssl"
     $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
     $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-    $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6"
+    $sha1 = "92288fb8f5d1af36960da518a21ed76cd9d7bd55"
     Write-Host "Fetching from URL ..."
     Download $externalUrl $internalUrl $packagex64
     Verify-Checksum $packagex64 $sha1
@@ -73,7 +73,7 @@ if (Is64BitWinHost) {
 
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236"
+$sha1 = "db9bb96d33f2393e2a9912a28e2921e6bc879203"
 
 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86

coin/provisioning/common/windows/squishInstall.ps1

@@ -38,7 +38,7 @@
 # NOTE! Make sure 64bit versions are always installed before 32bit,
 # because they use same folder name before a rename
 
-$version = "6.3.0"
+$version = "6.5.1"
 
 # Qt branch without dot (*.*)
 $qtBranch = "59x"

coin/provisioning/common/windows/vc_redist.ps1

@@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
 Write-Host "Installing $package..."
 Run-Executable $package "/q"
-Write-Host "Remove $package..."
-Remove-Item -Force -Path $package
+Remove $package

coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh

@@ -45,6 +45,6 @@
 set -ex
 
 # shellcheck source=../common/macos/install_xcode.sh
-source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
+source "${BASH_SOURCE%/*}/../common/macos/install_xcode_9_orHigher.sh"
 
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.2_updated.tar.gz 9.2

coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh

@@ -37,10 +37,10 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
 
-version="8.3.2"
-packageName="CommandLineToolsforXcode$version.dmg"
+version="9.2"
+packageName="Command_Line_Tools_macOS_10.12_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
-sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe"
+sha1="f121c3b70fb77a98c1f2fc5e1932bd93bde03acf"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version
 

coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh

@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
-opensslVersion="1.0.2p"
+opensslVersion="1.0.2t"
 opensslFile="openssl-$opensslVersion.tar.gz"
 opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
 opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
-opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c"
+opensslSha1="8ac3fd379cf8c8ef570abb51ec52a88fd526f88a"
 
 # Below target location has been hard coded into Coin.
 # QTQAINFRA-1195

coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1

@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+

coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1

@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+

coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1

@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+

coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1

@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+

coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1

@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+

coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1

@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+