Update submodules on '5.11.1' in qt5

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

.gitmodules

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

coin/platform_configs/qt5.txt

@@ -4,6 +4,7 @@ qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015    Packagin
 qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10                                   Mingw73     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
@@ -17,6 +18,6 @@ qtci-macos-10.12-x86_64-8   TvOS_ANY            multi       Clang       DebugAnd
 qtci-macos-10.12-x86_64-8   WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
 qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64  QNX_700             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

coin/provisioning/common/linux/android_linux.sh

@@ -37,8 +37,11 @@
 
 # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
 
+# shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
+# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 targetFolder="/opt/android"
@@ -78,10 +81,11 @@ else
 fi
 
 echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
+# shellcheck disable=SC2031
 if [ "$http_proxy" != "" ]; then
-    proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1)
+    proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1)
-    proxy_port=$(echo $proxy | cut -d':' -f3)
+    proxy_port=$(echo "$proxy" | cut -d':' -f3)
-    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
+    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
 else
     echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
 fi
@@ -91,12 +95,13 @@ SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
 SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
 
+# shellcheck disable=SC2129
 echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
 echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
 echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
 echo "Android NDK = $ndkVersion" >> ~/versions.txt
 
-cd $sdkTargetFolder/tools/bin
+cd "$sdkTargetFolder/tools/bin"
 echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"
 echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f
 # Purely informative, show the list of avd devices

coin/provisioning/common/linux/cmake_linux.sh

@@ -37,7 +37,9 @@
 
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
+# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 version="3.6.2"
@@ -50,3 +52,6 @@ appPrefix="cmake-$version-Linux-x86_64"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
 
 SetEnvVar "PATH" "$targetFolder/bin:\$PATH"
+
+echo "CMake = $version" >> ~/versions.txt
+

coin/provisioning/common/linux/disable-ntp_linux.sh

@@ -40,5 +40,5 @@ echo "Disable Network Time Protocol (NTP)"
 if uname -a |grep -q "Ubuntu"; then
     sudo timedatectl set-ntp false
 else
-    systemctl &>/dev/null && sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
+    (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off
 fi

coin/provisioning/common/linux/fbx_linux.sh

@@ -34,7 +34,10 @@
 #############################################################################
 
 # This script installs FBX SDK
+
+# shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 set -e

coin/provisioning/common/linux/integrity.sh

@@ -35,7 +35,9 @@
 
 # This script installs INTEGRITY
 
+# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 version="11.4.4"

coin/provisioning/common/linux/open62541.sh

@@ -35,6 +35,8 @@
 
 set +e
 
+# shellcheck disable=SC1090
+
 # We need to source to be able to use cmake in the shell
 if uname -a |grep -q "Ubuntu"; then
     source ~/.profile
@@ -44,18 +46,20 @@ fi
 
 set -ex
 
+# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
+# shellcheck disable=SC2064
 trap "sudo rm -fr $TEMPDIR" EXIT
-cd $TEMPDIR
+cd "$TEMPDIR"
 
 sudo pip install --upgrade pip
 sudo pip install six
 
 git clone https://github.com/open62541/open62541.git open62541
 cd open62541
-git checkout ba3b55ab4afafe6bc9d2cb922eafd51c6cee4629
+git checkout 8845e493d7751fd4eee3917b540e5346646b9cf7
 mkdir build
 cd build
 cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib/open62541 ..

coin/provisioning/common/linux/openssl_for_android_linux.sh

@@ -36,15 +36,17 @@
 # This script install OpenSSL from sources.
 # Requires GCC and Perl to be in PATH.
 
+# shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.0.2g"
+version="1.0.2o"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
 installFolder="/home/qt/"
-sha="36af23887402a5ea4ebef91df8e61654906f58f2"
+sha="a47faaca57b47a0d9d5fb085545857cc92062691"
 # Until every VM doing Linux Android builds have provisioned the env variable
 # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
 # QTQAINFRA-1436
@@ -54,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 
 tar -xzf "$targetFile" -C "$installFolder"
 # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
-mv "${opensslHome}g" "${opensslHome}"
+mv "${opensslHome}o" "${opensslHome}"
 pushd "$opensslHome"
 
 echo "Running configure"

coin/provisioning/common/linux/qnx_660.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# This script installs QNX 6.6.0.
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+targetFolder="/opt/"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660.tar.gz"
+sha1="E292CCAEF447AC1AA4DAD7802D604A5531ACD8D0"
+folderName="qnx660"
+targetFile="qnx660.tar.gz"
+wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
+echo "$sha1  $targetFile" | sha1sum --check
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
+sudo tar -C $targetFolder -xvzf $targetFile
+sudo chown -R qt:users "$targetFolder"/"$folderName"
+
+# Verify that we have last file in tar
+if [ ! -f $targetFolder/$folderName/qnx660-env.sh ]; then
+    echo "Installation failed!"
+    exit -1
+fi
+
+rm -rf $targetFile
+
+# Set env variables
+SetEnvVar "QNX_660" "$targetFolder$folderName"
+
+echo "QNX SDP = 6.6.0" >> ~/versions.txt

coin/provisioning/common/linux/qnx_700.sh

@@ -37,6 +37,7 @@
 
 set -ex
 
+# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 targetFolder="/opt/"

coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh

@@ -39,7 +39,7 @@
 
 set -ex
 
-# shellcheck source=DownloadURL.sh
+# shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
 function InstallAppFromCompressedFileFromURL {

coin/provisioning/common/macos/InstallPKGFromURL.sh

@@ -50,8 +50,8 @@ function InstallPKGFromURL {
         curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
     )
     echo "Checking SHA1 on PKG '$targetFile'"
-    echo "$expectedSha1 *$targetFile" > $targetFile.sha1
+    echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
-    /usr/bin/shasum --check $targetFile.sha1
+    /usr/bin/shasum --check "$targetFile.sha1"
     echo "Run installer on PKG"
     sudo installer -package "$targetFile" -target "$targetDirectory"
     echo "Removing file '$targetFile'"

coin/provisioning/common/macos/fbx_macos.sh

@@ -48,8 +48,6 @@ targetFolder="/tmp"
 targetFile="$targetFolder/$fileName"
 installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
 
-ExceptionExtractPrimaryUrl=100
-
 echo "Extracting '$cachedUrl'"
 tar -xzf "$cachedUrl" -C "$targetFolder" || (
     echo "Failed to uncompress from '$cachedUrl'"

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

@@ -32,6 +32,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+# shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 set -ex
 
@@ -44,19 +45,19 @@ function InstallCommandLineTools {
     packageName=$4
     version=$5
 
-    DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName
+    DownloadURL "$url" "$url_alt" "$expectedSha1" "/tmp/$packageName"
     echo "Mounting $packageName"
-    hdiutil attach /tmp/$packageName
+    hdiutil attach "/tmp/$packageName"
     cd "/Volumes/Command Line Developer Tools"
     echo "Installing"
-    sudo installer -verbose -pkg *.pkg -target /
+    sudo installer -verbose -pkg ./*.pkg -target /
     cd /
     # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
     sleep 3
     echo "Unmounting"
     umount /Volumes/Command\ Line\ Developer\ Tools/
     echo "Removing $packageName"
-    rm /tmp/$packageName
+    rm "/tmp/$packageName"
 
     echo "Command Line Tools = $version" >> ~/versions.txt
 }

coin/provisioning/common/macos/pip.sh

@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
-# Will install pip utility for python
+
-curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+function InstallPip {
-sudo python get-pip.py
+
-rm get-pip.py
+    python=$1
+
+    # Will install pip utility for python
+    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+    sudo "$python" get-pip.py
+    rm get-pip.py
+}

coin/provisioning/common/macos/python2.sh

@@ -35,8 +35,12 @@
 
 # This script installs python2
 
+# shellcheck source=./InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+# shellcheck source=./pip.sh
+source "${BASH_SOURCE%/*}/pip.sh"
 
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg"
 AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg"
@@ -45,8 +49,11 @@ DestDir="/"
 
 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
 
+InstallPip python2.7
+
 /Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv
 
 SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH"
 
 echo "python2 = 2.7.14" >> ~/versions.txt
+

coin/provisioning/common/macos/python3.sh

@@ -36,8 +36,12 @@
 
 # This script installs python3
 
+# shellcheck source=./InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+# shellcheck source=./pip.sh
+source "${BASH_SOURCE%/*}/pip.sh"
 
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg"
 AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg"
@@ -46,9 +50,12 @@ DestDir="/"
 
 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
 
+InstallPip python3.6
+
 /Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv
 
 SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
 SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
 
 echo "python3 = 3.6.1" >> ~/versions.txt
+

coin/provisioning/common/macos/sha1sum-compatibility.sh

@@ -45,5 +45,6 @@
 #     /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
 
 [ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
+# shellcheck disable=SC2012
 SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
 sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum

coin/provisioning/common/shared/http_proxy.txt

@@ -1,2 +1,2 @@
-proxy="http://proxy.intra.qt.io:3128"
+proxy=http://proxy.intra.qt.io:3128
 

coin/provisioning/common/shared/sw_versions.txt

@@ -1 +1 @@
-libclang_version="4.0"
+libclang_version="6.0"

coin/provisioning/common/unix/DownloadURL.sh

@@ -54,7 +54,8 @@ function DownloadURL {
     )
 
     echo "Checking SHA1 on PKG '$targetFile'"
-    echo "$expectedSha1 *$targetFile" > $targetFile.sha1
+    echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
-    sha1sum --check $targetFile.sha1
+    sha1sum --check "$targetFile.sha1"
+    rm -f "$targetFile.sha1"
 }
 

coin/provisioning/common/unix/check_and_set_proxy.sh

@@ -34,6 +34,7 @@
 
 set -ex
 
+# shellcheck source=../shared/http_proxy.txt
 source "${BASH_SOURCE%/*}/../shared/http_proxy.txt"
 
 (wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io && echo "Setting http_proxy to $proxy" && export http_proxy=$proxy) || echo "Proxy not detected at $proxy"

coin/provisioning/common/unix/libclang.sh

@@ -40,10 +40,13 @@
 # In case of Linux, we expect to get the values as args
 set -e
 
+# shellcheck source=./check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
+source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 
 BASEDIR=$(dirname "$0")
-. $BASEDIR/../shared/sw_versions.txt
+# shellcheck source=../shared/sw_versions.txt
+. "$BASEDIR/../shared/sw_versions.txt"
 url=$1
 sha1=$2
 version=$3
@@ -53,7 +56,7 @@ if [ $# -eq 0 ]
     echo "Using macOS defaults"
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z"
-    sha1="4781d154b274b2aec99b878c364f0ea80ff00a80"
+    sha1="10e48167b61726b20517172f8aff80fa1d9a379b"
 fi
 
 zip="libclang.7z"
@@ -61,10 +64,16 @@ destination="/usr/local/libclang-$version"
 
 curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url"
 echo "$sha1  $zip" | sha1sum --check
-7z x $zip -o/tmp/
+7z x "$zip" -o/tmp/
-rm -rf $zip
+rm -rf "$zip"
 
-sudo mv /tmp/libclang $destination
+sudo mv /tmp/libclang "$destination"
 
 echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
 echo "libClang = $version" >> ~/versions.txt
+
+if [ "$version" == "6.0" ]; then
+    # This is a hacked static build of libclang which requires special
+    # handling on the qdoc side.
+    SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1"
+fi

coin/provisioning/common/unix/squishInstall.sh

@@ -51,6 +51,9 @@ fi
 squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
 squishLicenseFile=".squish-3-license.tar.gz"
 
+testSuite="suite_test_squish"
+testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
+
 # These checks can be removed when Vanilla OS for all linux and Mac are in
 if [ -d "$squishFolder" ]; then
     echo "Move old squish to /tmp"
@@ -90,7 +93,7 @@ function MountAndInstall {
     targetFileMount="$mountFolder"/"$targetFile"
 
     echo "Mounting $url to $mountFolder"
-    sudo mount "$url" $mountFolder
+    sudo mount "$url" "$mountFolder"
     echo "Create $targetDirectory if needed"
     if [ !  -d "/opt" ]; then
         sudo mkdir "/opt"
@@ -109,19 +112,19 @@ function MountAndInstall {
         fi
         sudo tar -xzf "$targetFileMount" --directory "$target"
         echo "Unmounting $mountFolder"
-        sudo umount $mountFolder
+        sudo umount "$mountFolder"
     elif [[ $targetFile == *.dmg ]]; then
         echo "'dmg-file', no need to uncompress"
-        sudo cp $targetFileMount /tmp
+        sudo cp "$targetFileMount" /tmp
-        sudo umount $mountFolder
+        sudo umount "$mountFolder"
         sudo hdiutil attach "/tmp/$targetFile"
         sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory"
         sudo hdiutil unmount /Volumes/froglogic\ Squish/
     elif [[ $targetFile == *.run ]]; then
         echo "'run-file', no need to uncompress"
-        sudo cp $targetFileMount $targetDirectory
+        sudo cp "$targetFileMount" "$targetDirectory"
-        sudo umount $mountFolder
+        sudo umount "$mountFolder"
-        sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
+        sudo "$targetDirectory/$targetFile" unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
         sudo rm -fr "$targetDirectory/$targetFile"
         if uname -a |grep -q "Ubuntu"; then
             sudo mkdir /usr/lib/tcl8.6
@@ -140,10 +143,10 @@ echo "Set commands for environment variables in .bashrc"
 
 if uname -a |grep -q "Ubuntu"; then
     echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile
-    echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.profile
+    echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile
 else
     echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc
-    echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.bashrc
+    echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc
 fi
 
 echo "Installing squish license to home directory.."
@@ -151,3 +154,14 @@ MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile"
 
 echo "Installing squish $version.."
 MountAndInstall "$squishUrl" "$squishFolder" "$squishFile"
+
+echo "Installing test suite for squish"
+MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz"
+
+echo "Verifying Squish Installation"
+if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then
+    echo "Squish installation tested successfully"
+else
+    echo "Squish test failed! Package wasn't installed correctly."
+    exit 1
+fi

coin/provisioning/common/windows/03-conan.ps1

@@ -56,3 +56,5 @@ function Run-Conan-Install
         Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
     }
 }
+
+Write-Output "Conan = 0.24.0" >> ~\versions.txt

coin/provisioning/common/windows/3dstudio_3rdparty.ps1

@@ -1,11 +1,12 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"
+$zip = Get-DownloadLocation "Qt3DStudio-3rdparty-win64-CI.zip"
+
 $url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip"
 
 Download $url $url $zip
 Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
-Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty
+Extract-7Zip $zip C:\Utils\Qt3DStudio3rdparty
 Remove-Item -Path $zip
 
 Set-EnvironmentVariable "QT3DSTUDIO_3RDPARTY_DIR" "C:/Utils/Qt3DStudio3rdparty"

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

@@ -39,9 +39,9 @@
 # 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.2j"
+$version = "1.0.2o"
-$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
+$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
-$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
+$sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691"
 $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
@@ -67,3 +67,5 @@ 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
+
+Write-Output "Android OpenSSL = $version" >> ~/versions.txt

coin/provisioning/common/windows/android.ps1

@@ -66,7 +66,7 @@ function Install($1, $2, $3, $4) {
 
     Download $offcialUrl $cacheUrl $zip
     Verify-Checksum $zip "$checksum"
-    Extract-Zip $zip C:\Utils
+    Extract-7Zip $zip C:\Utils
 }
 
 function SdkUpdate ($1, $2) {
@@ -98,3 +98,9 @@ if ($p -ne $null) {
 } else {
     Write-Host "adb.exe not running"
 }
+
+Write-Output "Android SDK tools= $sdkVersion" >> ~/versions.txt
+Write-Output "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+Write-Output "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
+Write-Output "Android NDK = $ndkVersion" >> ~/versions.txt
+

coin/provisioning/common/windows/cmake.ps1

@@ -36,7 +36,7 @@
 $majorminorversion = "3.6"
 $version = "3.6.2"
 
-$zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip"
+$zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
 $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
 $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"
 
@@ -46,7 +46,7 @@ Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue
 Download $officialurl $cachedurl $zip
 Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
 
-Extract-Zip $zip C:
+Extract-7Zip $zip C:
 $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
 Rename-Item $defaultinstallfolder C:\CMake
 

coin/provisioning/common/windows/helpers.ps1

@@ -38,7 +38,8 @@ function Extract-7Zip
 {
     Param (
         [string]$Source,
-        [string]$Destination
+        [string]$Destination,
+        [string]$Filter
     )
     Write-Host "Extracting '$Source' to '$Destination'..."
 
@@ -54,47 +55,10 @@ function Extract-7Zip
         $zipExe = "7z.exe"
     }
 
-    Run-Executable "$zipExe" "x -y `"-o$Destination`" `"$Source`""
+    if ([string]::IsNullOrEmpty($Filter)) {
-}
+        Run-Executable "$zipExe" "x -y `"-o$Destination`" `"$Source`""
-
+    } else {
-function Extract-Zip
+        Run-Executable "$zipExe" "x -y -aoa `"-o$Destination`" `"$Source`" $Filter"
-{
-    Param (
-        [string]$Source,
-        [string]$Destination
-    )
-    Write-Host "Extracting '$Source' to '$Destination'..."
-
-    New-Item -ItemType Directory -Force -Path $Destination
-    $shell = new-object -com shell.application
-    $zipfile = $shell.Namespace($Source)
-    $destinationFolder = $shell.Namespace($Destination)
-    $destinationFolder.CopyHere($zipfile.Items(), 16)
-}
-
-function Extract-Dev-Folders-From-Zip
-{
-    Param (
-        [string]$package,
-        [string]$zipDir,
-        [string]$installPath
-    )
-
-    $shell = new-object -com shell.application
-
-    Write-Host "Extracting contents of $package"
-    foreach ($subDir in "lib", "include", "bin", "share") {
-        $zip = $shell.Namespace($package + "\" + $zipDir + "\" + $subDir)
-        if ($zip) {
-            Write-Host "Extracting $subDir from zip archive"
-        } else {
-            Write-Host "$subDir is missing from zip archive - skipping"
-            continue
-        }
-        $destDir = $installPath + "\" + $subdir
-        New-Item $destDir -type directory
-        $destinationFolder = $shell.Namespace($destDir)
-        $destinationFolder.CopyHere($zip.Items(), 16)
     }
 }
 
@@ -104,6 +68,17 @@ function BadParam
     throw("You must specify $Description")
 }
 
+function Get-DefaultDownloadLocation
+{
+    return $env:USERPROFILE + "\downloads\"
+}
+
+function Get-DownloadLocation
+{
+    Param ([string]$TargetName = $(BadParam("a target filename")))
+    return (Get-DefaultDownloadLocation) + $TargetName
+}
+
 function Download
 {
     Param (
@@ -153,10 +128,10 @@ function Is64BitWinHost
     return [environment]::Is64BitOperatingSystem
 }
 
-function isProxyEnabled {
+function IsProxyEnabled {
     return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyEnable
 }
 
-function getProxy {
+function Get-Proxy {
     return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
 }

coin/provisioning/common/windows/icu.ps1

@@ -43,3 +43,5 @@ if (Is64BitWinHost) {
 Set-EnvironmentVariable "CI_ICU_PATH_Mingw49" "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1"
 
 }
+
+Write-Output "ICU = $version" >> ~\versions.txt

coin/provisioning/common/windows/jom.ps1

@@ -1,9 +1,11 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = "c:\users\qt\downloads\jom_1_1_2.zip"
+$zip = Get-DownloadLocation "jom_1_1_2.zip"
 
 Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip
 Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"
-Extract-Zip $zip C:\Utils\Jom
+Extract-7Zip $zip C:\Utils\Jom
 
 Set-EnvironmentVariable "CI_JOM_PATH" "C:\Utils\Jom"
+
+Write-Output "Jom = 1.1.2" >> ~/versions.txt

coin/provisioning/common/windows/libclang.ps1

@@ -1,6 +1,7 @@
 param(
     [Int32]$archVer=32,
-    [string]$toolchain="vs2015"
+    [string]$toolchain="vs2015",
+    [bool]$setDefault=$true
 )
 . "$PSScriptRoot\helpers.ps1"
 
@@ -11,20 +12,22 @@ param(
 
 Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
     $var = $_.Split('=')
-    New-Variable -Name $var[0] -Value $var[1]
+    New-Variable -Name $var[0] -Value $var[1] -Force
     $libclang_version = $libclang_version -replace '["."]'
 }
 
-$zip = "c:\users\qt\downloads\libclang.7z"
+$zip = Get-DownloadLocation "libclang.7z"
-$baseDestination = "C:\Utils\libclang-" + $libclang_version
+$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain
 
 function setURL() {
     $script:url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
 }
 
+$toolchainSuffix = ""
+
 if ( $toolchain -eq "vs2015" ) {
     if ( $archVer -eq 64 ) {
-        $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
+        $sha1 = "37afa18d243a50c05bee5c6e16b409ed526ec17a"
         $destination = $baseDestination + "-64"
 
         setURL
@@ -37,7 +40,7 @@ if ( $toolchain -eq "vs2015" ) {
     }
 
     $archVer=32
-    $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
+    $sha1 = "812b6089c6da99ced9ebebbd42923bd96590519d"
     $destination = $baseDestination + "-32"
 
     setURL
@@ -47,11 +50,12 @@ if ( $toolchain -eq "vs2015" ) {
     Extract-7Zip $zip C:\Utils\
     Rename-Item C:\Utils\libclang $destination
     Remove-Item -Force -Path $zip
+    $toolchainSuffix = "msvc"
 }
 
 if ( $toolchain -eq "mingw" ) {
     if ( $archVer -eq 64 ) {
-        $sha1 = "3e318f70a1e76c14365ced65f4fa7031bb730818"
+        $sha1 = "1233e6c008b90d89483df0291a597a0bac426d29"
         $destination = $baseDestination + "-64"
 
         setURL
@@ -64,7 +68,7 @@ if ( $toolchain -eq "mingw" ) {
     }
 
     $archVer=32
-    $sha1 = "a9973192a01a9c16976ed0cc6ef6dac3dbc4a2d3"
+    $sha1 = "2d6ceab0e1a05e2b19fe615c57b64d36977b4933"
     $destination = $baseDestination + "-32"
 
     setURL
@@ -74,7 +78,17 @@ if ( $toolchain -eq "mingw" ) {
     Extract-7Zip $zip C:\Utils\
     Rename-Item C:\Utils\libclang $destination
     Remove-Item -Force -Path $zip
+    $toolchainSuffix = "mingw"
 }
 
-Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
+if ( $setDefault ) {
+    Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
+}
+Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
 Write-Output "libClang = $libclang_version" >> ~/versions.txt
+
+if ( $libclang_version -eq "60" ) {
+    # This is a hacked static build of libclang which requires special
+    # handling on the qdoc side.
+    Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"
+}

coin/provisioning/common/windows/libusb.ps1

@@ -35,7 +35,7 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196-msvc2015.7z"
+$archive = Get-DownloadLocation "libusb-1.0.21-ife3db79196-msvc2015.7z"
 $libusb_location = "C:\Utils\libusb-1.0"
 
 Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive
@@ -45,3 +45,5 @@ Extract-7Zip $archive $libusb_location
 
 # Tell qt-apps/qdb build system where to find libusb
 Set-EnvironmentVariable "LIBUSB_PATH" $libusb_location
+
+Write-Output "libusb = libusb-1.0.21" >> ~/versions.txt

coin/provisioning/common/windows/mesa_llvmpipe.ps1

@@ -62,3 +62,4 @@ if (Is64BitWinHost) {
     Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32"
 }
 
+Write-Output "Mesa llvmpipe = $version" >> ~/versions.txt

coin/provisioning/common/windows/mqtt_broker.ps1

@@ -34,7 +34,7 @@
 . "$PSScriptRoot\helpers.ps1"
 
 Write-Host "MQTT: Downloading Paho test broker..."
-$zip = "c:\users\qt\downloads\pahotest.zip"
+$zip = Get-DownloadLocation "pahotest.zip"
 $externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
 $internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
 $sha1 = "532fe145096cdd8d679f425cbfd883289150c968"
@@ -43,7 +43,7 @@ Download $externalUrl $internalUrl $zip
 Verify-Checksum $zip $sha1
 
 Write-Host "MQTT: Installing $zip..."
-Extract-Zip $zip C:\Utils
+Extract-7Zip $zip C:\Utils
 Remove-Item -Path $zip
 
 Set-EnvironmentVariable "MQTT_TEST_BROKER_LOCATION" "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py"

coin/provisioning/common/windows/msvc-2013-update5.ps1

@@ -38,13 +38,13 @@ $version = "2013 Update 5 (KB2829760)"
 $package = "C:\Windows\Temp\vs12-kb2829760.exe"
 $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe"
 
-Write-Output "Fetching patch for Visual Studio $version..."
+Write-Host "Fetching patch for Visual Studio $version..."
 Copy-Item $url_cache $package
 
-Write-Output "Installing Update 5 for Visual Studio $version..."
+Write-Host "Installing Update 5 for Visual Studio $version..."
-Start-Process -FilePath $package -ArgumentList "/norestart /passive" -Wait
+Run-Executable "$package" "/norestart /passive"
 
-Write-Output "Removing $package ..."
+Write-Host "Removing $package ..."
 Remove-Item $package
 
 Write-Output "Visual Studio = $version" >> ~\versions.txt

coin/provisioning/common/windows/msvc_2015_update3_patch.ps1

@@ -63,3 +63,5 @@ Write-Host "Installing patch for Visual Studio $version..."
 Run-Executable $executable "/norestart /passive"
 
 Remove-Item -Force -Recurse -Path $toRemove
+
+Write-Output "Visual Studio = $version" >> ~\versions.txt

coin/provisioning/common/windows/mysql.ps1

@@ -37,8 +37,11 @@
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
 $version = "5.6.11"
-$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip"
+$baseNameX64 = "mysql-$version-winx64"
-$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"
+$packagex64 = "C:\Windows\temp\$baseNameX64.zip"
+$baseNameX86 = "mysql-$version-win32"
+$packagex86 = "C:\Windows\temp\$baseNameX86.zip"
+$installFolder = "C:\Utils\my_sql"
 
 function DownloadAndInstall
 {
@@ -52,7 +55,7 @@ function DownloadAndInstall
     Copy-Item $internalUrl $package
 
     $zipDir = [io.path]::GetFileNameWithoutExtension($package)
-    Extract-Dev-Folders-From-Zip $package $zipDir $installPath
+    Extract-7Zip $package $installPath "$zipDir\lib $zipDir\bin $zipDir\share $zipDir\include"
 
     Remove-Item -Path $package
 }
@@ -60,28 +63,21 @@ function DownloadAndInstall
 if (Is64BitWinHost) {
     # Install x64 bit version
     $architecture = "x64"
-    $installFolder = "C:\Utils\my_sql\my_sql"
     $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"
 
     DownloadAndInstall $internalUrl $packagex64 $installFolder
 
-    Set-EnvironmentVariable "MYSQL_INCLUDE_x64" "$installFolder\include"
+    Set-EnvironmentVariable "MYSQL_INCLUDE_x64" "$installFolder\$baseNameX64\include"
-    Set-EnvironmentVariable "MYSQL_LIB_x64" "$installFolder\lib"
+    Set-EnvironmentVariable "MYSQL_LIB_x64" "$installFolder\$baseNameX64\lib"
 }
 
 # Install x86 bit version
 $architecture = "x86"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip"
-if (Is64BitWinHost) {
-    $installFolder = "C:\Utils\my_sql\my_sql$architecture"
-} else {
-    $installFolder = "C:\Utils\my_sql\my_sql"
-}
-
 DownloadAndInstall $internalUrl $packagex86 $installFolder
 
-Set-EnvironmentVariable "MYSQL_INCLUDE_x86" "$installFolder\include"
+Set-EnvironmentVariable "MYSQL_INCLUDE_x86" "$installFolder\$baseNameX86\include"
-Set-EnvironmentVariable "MYSQL_LIB_x86" "$installFolder\lib"
+Set-EnvironmentVariable "MYSQL_LIB_x86" "$installFolder\$baseNameX86\lib"
 
 # Store version information to ~/versions.txt, which is used to print version information to provision log.
 Write-Output "MySQL = $version" >> ~/versions.txt

coin/provisioning/common/windows/ninja.ps1

@@ -1,11 +1,13 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = "c:\users\qt\downloads\ninja-1.6.0-win-x86.zip"
+$zip = Get-DownloadLocation "ninja-1.6.0-win-x86.zip"
 
 Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
 Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"
 
-Extract-Zip $zip C:\Utils\Ninja
+Extract-7Zip $zip C:\Utils\Ninja
 Remove-Item -Path $zip
 
 Add-Path "C:\Utils\Ninja"
+
+Write-Output "Ninja = 1.6.0" >> ~/versions.txt

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_2j"
+$version = "1_0_2o"
 $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 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
+    $sha1 = "86c71a28eda53fa406b957dd37491d616344b464"
 
     Write-Host "Fetching from URL ..."
     Download $externalUrl $internalUrl $packagex64
@@ -74,7 +74,7 @@ if (Is64BitWinHost) {
 
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
+$sha1 = "bfc14fc03bd1d4dd03bf5459f62969d6b0ee96fe"
 
 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86

coin/provisioning/common/windows/postgresql.ps1

@@ -43,7 +43,7 @@ $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
 if (Is64BitWinHost) {
     # Install x64 bit versions
     $architecture = "x64"
-    $installFolder = "C:\Utils\postgresql\pgsql"
+    $installFolder = "C:\Utils\postgresql"
     $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
     $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
     $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
@@ -52,13 +52,13 @@ if (Is64BitWinHost) {
     Download $externalUrl $internalUrl $packagex64
     Verify-Checksum $packagex64 $sha1
     Write-Host "Installing $packagex64 ..."
-    Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
+    Extract-7Zip $packagex64 $installFolder "pgsql\lib pgsql\bin pgsql\share pgsql\include"
 
     Write-Host "Remove downloaded $packagex64 ..."
     Remove-Item -Path $packagex64
 
-    Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\include"
+    Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\pgsql\include"
-    Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\lib"
+    Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\pgsql\lib"
 }
 
 # Install x86 bit version
@@ -67,9 +67,9 @@ $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windo
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip"
 $sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
 if (Is64BitWinHost) {
-    $installFolder = "C:\Utils\postgresql$architecture\pgsql"
+    $installFolder = "C:\Utils\postgresql$architecture"
 } else {
-    $installFolder = "C:\Utils\postgresql\pgsql"
+    $installFolder = "C:\Utils\postgresql"
 }
 
 
@@ -77,13 +77,13 @@ Write-Host "Fetching from URL..."
 Download $externalUrl $internalUrl $packagex86
 Verify-Checksum $packagex86 $sha1
 Write-Host "Installing $packagex86 ..."
-Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder
+Extract-7Zip $packagex86 $installFolder "pgsql\lib pgsql\bin pgsql\share pgsql\include"
 
 Write-Host "Remove downloaded $packagex86 ..."
 Remove-Item -Path $packagex86
 
-Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\include"
+Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\pgsql\include"
-Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\lib"
+Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\pgsql\lib"
 
 # Store version information to ~/versions.txt, which is used to print version information to provision log.
 Write-Output "PostgreSQL = $version" >> ~/versions.txt

coin/provisioning/common/windows/python.ps1

@@ -30,13 +30,17 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\helpers.ps1"
 
 # This script installs Python $version.
 # Python is required for building Qt 5 from source.
+param(
+    [Int32]$archVer=32,
+    [string]$targetDir="C:\Python27"
+)
+. "$PSScriptRoot\helpers.ps1"
 
 $version = "2.7.13"
-if (Is64BitWinHost) {
+if ( $archVer -eq 64 ) {
     $arch = ".amd64"
     $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
 } else {
@@ -51,21 +55,32 @@ Write-Host "Fetching from URL..."
 Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
 Write-Host "Installing $package..."
-Run-Executable "msiexec" "/passive /i $package ALLUSERS=1"
+Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1"
 
 # We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB
 Write-Host "Changing allowZip64 value to 'True'..."
-(Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py
+(Get-Content $targetDir\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content $targetDir\lib\zipfile.py
 Write-Host "Remove $package..."
 Remove-Item -Path $package
 
-Add-Path "C:\Python27;C:\Python27\Scripts"
+# When installing 32 bit python to 64 bit host, we want to keep only default python in path
+# For cross-compilation we export some helper env variable
+if (($archVer -eq 32) -And (Is64BitWinHost)) {
+    Set-EnvironmentVariable "PYTHON2_32_PATH" "$targetDir"
+    Set-EnvironmentVariable "PIP2_32_PATH" "$targetDir\Scripts"
+} else {
+    Add-Path "$targetDir;$targetDir\Scripts"
+}
 
-Run-Executable "C:\Python27\python.exe" "-m ensurepip"
+
+Run-Executable "$targetDir\python.exe" "-m ensurepip"
 
 # Install python virtual env
-#if (isProxyEnabled) {
+if (IsProxyEnabled) {
-#    Write-Host "Using proxy with pip"
+    $proxy = Get-Proxy
-#    $pip_args = "--proxy=" + (getProxy)
+    Write-Host "Using proxy ($proxy) with pip"
-#}
+    $pip_args = "--proxy=$proxy"
-Run-Executable "C:\Python27\Scripts\pip.exe" "install virtualenv"
+}
+Run-Executable "$targetDir\Scripts\pip.exe" "$pip_args install virtualenv"
+
+Write-Output "Python-$archVer = $version" >> ~/versions.txt

coin/provisioning/common/windows/python3.ps1

@@ -32,18 +32,20 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
-
 # This script installs Python $version.
 # Python3 is required for building some qt modules.
+param(
+    [Int32]$archVer=32,
+    [string]$install_path = "C:\Python36"
+)
+. "$PSScriptRoot\helpers.ps1"
 
 $version = "3.6.1"
 $package = "C:\Windows\temp\python-$version.exe"
-$install_path = "C:\Python36"
 
 # check bit version
-if (Is64BitWinHost) {
+if ( $archVer -eq 64 ) {
-    Write-Host "Running in 64 bit system"
+    Write-Host "Installing 64 bit Python"
     $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe"
     $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe"
     $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff"
@@ -61,12 +63,23 @@ Run-Executable "$package" "/q TargetDir=$install_path"
 Write-Host "Remove $package..."
 Remove-Item -Path $package
 
-Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
+# For cross-compilation we export some helper env variable
-Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
+if (($archVer -eq 32) -And (Is64BitWinHost)) {
+    Set-EnvironmentVariable "PYTHON3_32_PATH" "$install_path"
+    Set-EnvironmentVariable "PIP3_32_PATH" "$install_path\Scripts"
+} else {
+    Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
+    Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
+}
+
 
 # Install python virtual env
-#if (isProxyEnabled) {
+if (IsProxyEnabled) {
-#    Write-Host "Using proxy with pip"
+    $proxy = Get-Proxy
-#    $pip_args = "--proxy=" + (getProxy)
+    Write-Host "Using proxy ($proxy) with pip"
-#}
+    $pip_args = "--proxy=$proxy"
-Run-Executable "$install_path\Scripts\pip3.exe" "install virtualenv"
+}
+Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv"
+
+Write-Output "Python3-$archVer = $version" >> ~/versions.txt
+

coin/provisioning/common/windows/set-proxy.ps1

@@ -35,7 +35,7 @@ $n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt"
 $n = $n.Split('=')
 New-Variable -Name $n[0] -Value $n[1]
 
-if (([string]::IsNullOrEmpty($proxy)) -or ($proxy -eq '""')) {
+if ([string]::IsNullOrEmpty($proxy)) {
     Write-Host "No proxy is defined."
 } else {
     Write-Host "Checking proxy @ $proxy"

coin/provisioning/common/windows/squishInstall.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -48,6 +48,8 @@ $qtBranch = "59x"
 $targetDir = "C:\Utils\squish"
 $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
 $squishBranchUrl = "$squishUrl\$qtBranch"
+$testSuite = "suite_test_squish"
+$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z"
 
 # Squish license
 $licensePackage = ".squish-3-license"
@@ -77,9 +79,13 @@ Function DownloadAndInstallSquish {
             $squishPackage64bit = "$squishPackage`_64"
         }
         Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
+        TestSquish $squishPackage64bit
     } else {
         if ($squishPackage.StartsWith("mingw")) {
             Rename-Item $targetDir\$squishPackage $targetDir\mingw
+            TestSquish mingw
+        } else {
+            TestSquish $squishPackage
         }
     }
 }
@@ -93,10 +99,27 @@ Function DownloadSquishLicence {
     Copy-Item $squishUrl\$licensePackage ~\$licensePackage
 }
 
+Function TestSquish {
+    Param (
+        [string]$squishPackage
+    )
+
+    Write-Host "Verifying Squish Installation"
+    if (cmd /c "$targetDir\$squishPackage\bin\squishrunner.exe --testsuite $targetDir\$testSuite" |Select-String -Pattern "Squish test run successfully") {
+        Write-Host "Squish installation tested successfully!"
+    } else {
+        Write-Host "Squish test failed! $squishPackage wasn't installed correctly."
+        [Environment]::Exit(1)
+    }
+}
 
 Write-Host "Creating $targetDir"
 New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir"
 
+Write-Host "Download and install Test Suite for squish"
+Copy-Item $testSuiteUrl $targetDir/$testSuite.7z
+Extract-7Zip $targetDir/$testSuite.7z $targetDir
+
 DownloadSquishLicence $squishUrl
 
 if ($OSVersion -eq "Windows 10 Enterprise") {

coin/provisioning/common/windows/unset-proxy.ps1

@@ -32,6 +32,8 @@
 #############################################################################
 
 Write-Host "Disabling proxy"
+# A bit-mask is needed to disable "Automatically detect settings" from LAN
+# settings that disturb and re-enable proxy even after disabling it.
 $dcs = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections").DefaultConnectionSettings
 $dcs[8] = $_ -band 0xF7
 Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections" -Name DefaultConnectionSettings -Value $dcs

coin/provisioning/common/windows/win10sdk.ps1

@@ -0,0 +1,50 @@
+############################################################################
+##
+## Copyright (C) 2018 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 Windows 10 SDK
+
+$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\winsdksetup.exe"
+$url_official = "https://download.microsoft.com/download/8/C/3/8C37C5CE-C6B9-4CC8-8B5F-149A9C976035/windowssdk/winsdksetup.exe"
+$package = "C:\Windows\Temp\winsdksetup.exe"
+$sha1 = "db237323f1779fb143e7cdc558e4345e7004489e"
+
+Copy-Item $url_cache $package
+Verify-Checksum $package $sha1
+Run-Executable $package "/features + /q"
+
+Write-Host "Cleaning $package.."
+Remove-Item -Recurse -Force -Path "$package"
+
+Write-Output "Windows 10 SDK = 10.0.16229.91" >> ~\versions.txt

coin/provisioning/common/windows/winrtrunner.ps1

@@ -1,11 +1,12 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = "c:\users\qt\downloads\winrtrunner.zip"
+$zip = Get-DownloadLocation "winrtrunner.zip"
-$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip"
+$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner_2018-05-24.zip"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\winrtrunner\winrtrunner_2018-05-24.zip"
 
-Download $url $url $zip
+Download $url $url_cache $zip
-Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42"
+Verify-Checksum $zip "b83f2166b5799910a661d1db02771edf94880785"
-Extract-Zip $zip C:\Utils\winrtrunner
+Extract-7Zip $zip C:\Utils\winrtrunner
 Remove-Item -Path $zip
 
 Set-EnvironmentVariable "CI_WINRTRUNNER_PATH" "C:\Utils\winrtrunner"

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh

@@ -35,8 +35,10 @@
 
 set -ex
 
+# shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
+# shellcheck disable=SC2031
 if [ "$http_proxy" != "" ]; then
     echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
 fi

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
+# shellcheck source=../common/linux/disable-ntp_linux.sh
 source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh

@@ -33,6 +33,7 @@
 ##
 #############################################################################
 
+# shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
 package="epel-release-6-8.noarch.rpm"

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh

@@ -1,11 +1,43 @@
 #!/usr/bin/env bash
 
+#############################################################################
+##
+## Copyright (C) 2018 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$
+##
+#############################################################################
 set -ex
 
 BASEDIR=$(dirname "$0")
-. $BASEDIR/../common/shared/sw_versions.txt
+# With RHEL 6.6 we are using different lib clang than others
-VERSION=$libclang_version
+VERSION=4.0
 URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
 SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
 
-$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"
+"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -ex
 
-$(dirname $0)/../common/linux/cmake_linux.sh
+"$(dirname "$0")/../common/linux/cmake_linux.sh"

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh

@@ -33,4 +33,5 @@
 ##
 #############################################################################
 
+# shellcheck source=../common/unix/mqtt_broker.sh
 source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh

@@ -45,27 +45,28 @@ function Install7ZPackageFromURL {
     expectedSha1=$2
     targetDirectory=$3
 
-    targetFile=`mktemp`
+    targetFile=$(mktemp)
-    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
+    wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
     echo "$expectedSha1  $targetFile" | sha1sum --check
-    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile
+    sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile"
-    rm $targetFile
+    rm "$targetFile"
 }
 
 echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
 
 baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
-Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
+Install7ZPackageFromURL "$baseBinaryPackageURL" "$sha1" "/usr/lib64"
 
 echo "Installing custom ICU devel packages on RHEL"
 
 sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
 develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
-tempDir=`mktemp -d`
+tempDir=$(mktemp -d)
+# shellcheck disable=SC2064
 trap "sudo rm -fr $tempDir" EXIT
-Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
+Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir"
-sudo cp -a $tempDir/lib/* /usr/lib64
+sudo cp -a "$tempDir/lib"/* /usr/lib64
-sudo cp -a $tempDir/* /usr/
+sudo cp -a "$tempDir"/* /usr/
 
 sudo /sbin/ldconfig
 

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh

@@ -39,9 +39,10 @@
 
 set -ex
 
+# shellcheck disable=SC2129
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
 rpm -q -a | sort >> ~/versions.txt
 echo "*********************************************" >> ~/versions.txt
 
-$(dirname $0)/../common/linux/version.sh
+"$(dirname "$0")/../common/linux/version.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh

@@ -36,7 +36,8 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-source $BASEDIR/../common/shared/network_test_server_ip.txt
+# shellcheck source=../common/shared/network_test_server_ip.txt
+source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh

@@ -35,6 +35,7 @@
 
 set -ex
 
+# shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
 package="epel-release-7-11.noarch.rpm"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh

@@ -63,8 +63,8 @@ installPackages+=(gtk3-devel)
 installPackages+=(libusbx-devel)
 # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
 installPackages+=(speech-dispatcher-devel)
-# Python 2.7 with python-devel, pip and virtualenv
+# Python 2 devel and pip. python-pip requires the EPEL repository to be added
-installPackages+=(python27)
+installPackages+=(python-devel python-pip)
 # Python 3 with python-devel, pip and virtualenv
 installPackages+=(rh-python36)
 # WebEngine
@@ -89,11 +89,18 @@ installPackages+=(libxml2-devel)
 installPackages+=(libxslt-devel)
 # For building Wayland from source
 installPackages+=(libffi-devel)
+# QtWayland
+installPackages+=(mesa-libwayland-egl)
+installPackages+=(mesa-libwayland-egl-devel)
+installPackages+=(libwayland-client)
+installPackages+=(libwayland-cursor)
+installPackages+=(libwayland-server)
 
 sudo yum -y install "${installPackages[@]}"
 
-# Make python 2.7 and its pip default
-echo "source scl_source enable python27" >> ~/.bashrc
-
 sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3
 sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
+# We shouldn't use yum to install virtualenv. The one found from package repo is not
+# working, but we can use installed pip
+sudo pip install --upgrade pip
+sudo pip install virtualenv

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh

@@ -2,9 +2,10 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-. $BASEDIR/../common/shared/sw_versions.txt
+# shellcheck source=../common/shared/sw_versions.txt
+. "$BASEDIR/../common/shared/sw_versions.txt"
 VERSION=$libclang_version
 URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
-SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
+SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0"
 
-$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"
+"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh

@@ -39,4 +39,5 @@ set -ex
 
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
+# shellcheck source=../common/linux/cmake_linux.sh
 source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/qnx_700.sh
 source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/integrity.sh
 source "${BASH_SOURCE%/*}/../common/linux/integrity.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/disable_selinux.sh
 source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh

@@ -34,8 +34,10 @@
 #############################################################################
 set +e
 
+# shellcheck disable=SC1091
 source /opt/rh/devtoolset-4/enable
 
 set -ex
 
+# shellcheck source=../common/linux/openssl_for_android_linux.sh
 source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh

@@ -33,4 +33,5 @@
 ##
 #############################################################################
 
+# shellcheck source=../common/unix/mqtt_broker.sh
 source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/fbx_linux.sh
+"$BASEDIR/../common/linux/fbx_linux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh

@@ -47,26 +47,26 @@ develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/
 
 echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
 
-targetFile=`mktemp`
+targetFile=$(mktemp)
-wget --tries=5 --waitretry=5 --output-document=$targetFile $baseBinaryPackageURL
+wget --tries=5 --waitretry=5 --output-document="$targetFile" "$baseBinaryPackageURL"
 echo "$sha1  $targetFile" | sha1sum --check
-sudo 7z x -y -o"/usr/lib64" $targetFile
+sudo 7z x -y -o/usr/lib64 "$targetFile"
-sudo rm $targetFile
+sudo rm "$targetFile"
 
 echo "Installing custom ICU devel packages on RHEL"
 
-tempDir=`mktemp -d`
+tempDir=$(mktemp -d)
 
-targetFile=`mktemp`
+targetFile=$(mktemp)
-wget --tries=5 --waitretry=5 --output-document=$targetFile $develPackageURL
+wget --tries=5 --waitretry=5 --output-document="$targetFile" "$develPackageURL"
 echo "$sha1Dev $targetFile" | sha1sum --check
-7z x -y -o$tempDir $targetFile
+7z x -y -o"$tempDir" "$targetFile"
 
-sudo cp -a $tempDir/lib/* /usr/lib64
+sudo cp -a "$tempDir"/lib/* /usr/lib64
-sudo cp -a $tempDir/* /usr/
+sudo cp -a "$tempDir"/* /usr/
 
-sudo rm $targetFile
+sudo rm "$targetFile"
-sudo rm -fr $tempDir
+sudo rm -fr "$tempDir"
 
 sudo /sbin/ldconfig
 

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh

@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/android_linux.sh
 source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh

@@ -33,4 +33,5 @@
 ##
 #############################################################################
 
+# shellcheck source=../common/linux/open62541.sh
 source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/unix/squishInstall.sh
+"$BASEDIR/../common/unix/squishInstall.sh"
 

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh

@@ -33,31 +33,16 @@
 ##
 #############################################################################
 
+# This script needs to be called last during provisioning so that the software information will show up last in provision log.
+
+# Storage installed RPM packages information
+
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+# shellcheck disable=SC2129
+echo "*********************************************" >> ~/versions.txt
+echo "***** All installed RPM packages *****" >> ~/versions.txt
+rpm -q -a | sort >> ~/versions.txt
+echo "*********************************************" >> ~/versions.txt
 
-version=1.12.0
+"$(dirname "$0")/../common/linux/version.sh"
-sha1="9a0dd96f53fff3e227035ed76caaa209b632ea8d"
-archive="wayland-$version.tar.xz"
-primaryUrl="https://wayland.freedesktop.org/releases/$archive"
-cacheUrl="http://ci-files01-hki.intra.qt.io/input/wayland/$archive"
-
-echo "Installing Wayland $version $sha1 on RHEL"
-
-targetFile="/tmp/$archive"
-DownloadURL $primaryUrl $cacheUrl $sha1 $targetFile
-tar xf $targetFile --directory /tmp/
-rm $targetFile
-
-cd /tmp/wayland-$version
-./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib64 \
-    --disable-static \
-    --disable-documentation
-make
-sudo make install
-rm -rf /tmp/wayland-$version
-
-echo "wayland = $version" >> ~/versions.txt

coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-systemsetup.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# This script modifies system settings for automated use
+
+set -ex
+
+# shellcheck source=../common/unix/check_and_set_proxy.sh
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
+
+NTS_IP=10.212.2.216
+
+echo "Set timezone to UTC."
+sudo timedatectl set-timezone Etc/UTC
+echo "Timeout for blanking the screen (0 = never)"
+gsettings set org.gnome.desktop.session idle-delay 0
+echo "Prevents screen lock when screesaver goes active."
+gsettings set org.gnome.desktop.screensaver lock-enabled false
+echo "Disable questions on shutdown."
+gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
+
+echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
+echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
+
+if [ "$proxy" != "" ]; then
+    echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf
+fi

coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# Install required packages with APT
+
+set -ex
+
+echo "Disabling auto update"
+sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic
+for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do
+    sudo systemctl stop $service
+    sudo systemctl disable $service
+done
+
+installPackages+=(git)
+installPackages+=(p7zip-full)
+installPackages+=(expect)
+
+echo "Running update for apt"
+sudo apt-get update
+echo "Installing packages"
+sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
+

coin/provisioning/qtci-linux-Ubuntu-16.04-x86/90-squish.sh

@@ -1,6 +1,3 @@
 #!/usr/bin/env bash
-
-set -ex
-
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/pip.sh
+"$BASEDIR/../common/unix/squishInstall.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh

@@ -59,3 +59,6 @@ echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/h
 if [ "$http_proxy" != "" ]; then
     echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf
 fi
+
+# This won't be needed for Ubuntu 17 and above, see QTBUG-67757.
+sudo sed -i '/-UnityDecoration-extents/c\    -UnityDecoration-extents: 0 0 0 0;' /usr/share/themes/Ambiance/gtk-3.0/apps/unity.css

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

@@ -124,6 +124,7 @@ installPackages+=(curl)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
+installPackages+=(zlib1g:i386)
 installPackages+=(openjdk-8-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2018 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$
+##
+#############################################################################
+
+# Install Git Large File Storage
+
+set -ex
+
+sudo apt-add-repository 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main'
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 37BBEE3F7AD95B3F
+sudo apt update
+sudo apt install git-lfs

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh

@@ -4,6 +4,6 @@ BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/shared/sw_versions.txt
 VERSION=$libclang_version
 URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
-SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
+SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0"
 
 $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh

@@ -0,0 +1,38 @@
+#!/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2018 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$
+##
+#############################################################################
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/99-version.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2018 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 needs to be called last during provisioning so that the software information will show up last in provision log.
+
+set -ex
+
+# shellcheck disable=SC2129
+echo "*********************************************" >> ~/versions.txt
+echo "***** All installed packages *****" >> ~/versions.txt
+apt list --installed >> ~/versions.txt
+echo "*********************************************" >> ~/versions.txt
+
+"$(dirname "$0")/../common/linux/version.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2018 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$
+##
+#############################################################################
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+
+url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa"
+sha1="1b0d651661c33a654ac89ef3c97bbe06d6bf1ca1"
+sshKey="$HOME/.ssh/test_farm_id_rsa"
+
+DownloadURL "$url" "$url" "$sha1" "$sshKey"
+chmod 600 "$sshKey"
+
+echo "Configuring ssh config file for Yocto"
+cat <<EOT >> "$HOME/.ssh/config"
+StrictHostKeyChecking=no
+Host codereview.qt-project.org
+  Port 29418
+  User qt-builder
+  IdentityFile "$sshKey"
+EOT
+

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh

@@ -3,7 +3,9 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-source $BASEDIR/../common/shared/network_test_server_ip.txt
+# shellcheck source=../common/shared/network_test_server_ip.txt
+source "$BASEDIR/../common/shared/network_test_server_ip.txt"
+# shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
@@ -17,6 +19,7 @@ sudo balooctl disable
 echo "Disable update notifications"
 sudo zypper -nq remove plasma5-pk-updates
 
+# shellcheck disable=SC2031
 if [ "$http_proxy" != "" ]; then
     sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy
     sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh

@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
+# shellcheck source=../common/linux/disable-ntp_linux.sh
 source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh

@@ -60,5 +60,8 @@ sudo zypper -nq install libxslt-devel
 sudo zypper -nq install gstreamer-devel
 sudo zypper -nq install gstreamer-plugins-base-devel
 
+# pulseaudio (qtmultimedia)
+sudo zypper -nq install libpulse-devel
+
 # cups
 sudo zypper -nq install cups-devel

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh

@@ -3,9 +3,10 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-. $BASEDIR/../common/shared/sw_versions.txt
+# shellcheck source=../common/shared/sw_versions.txt
+. "$BASEDIR/../common/shared/sw_versions.txt"
 VERSION=$libclang_version
 URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
-SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
+SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0"
 
-$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"
+"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh

@@ -2,4 +2,4 @@
 
 set -ex
 
-$(dirname $0)/../common/linux/cmake_linux.sh
+"$(dirname "$0")/../common/linux/cmake_linux.sh"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh

@@ -35,6 +35,7 @@
 
 # This script install Intel Parallel Studio XE Composer Edition for C++ Linux
 
+# shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
 set -ex

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh

@@ -33,4 +33,5 @@
 ##
 #############################################################################
 
+# shellcheck source=../common/unix/mqtt_broker.sh
 source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh

@@ -33,4 +33,5 @@
 ##
 #############################################################################
 
+# shellcheck source=../common/linux/open62541.sh
 source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/unix/squishInstall.sh
+"$BASEDIR/../common/unix/squishInstall.sh"
 

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-version.sh

@@ -33,29 +33,16 @@
 ##
 #############################################################################
 
+# This script needs to be called last during provisioning so that the software information will show up last in provision log.
+
+# Storage installed RPM packages information
+
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+# shellcheck disable=SC2129
+echo "*********************************************" >> ~/versions.txt
+echo "***** All installed RPM packages *****" >> ~/versions.txt
+rpm -q -a | sort >> ~/versions.txt
+echo "*********************************************" >> ~/versions.txt
 
-version="17.0.1-6.20170307.wayland"
+"$(dirname "$0")/../common/linux/version.sh"
-wayland_egl_rpm="mesa-libwayland-egl-$version.el7.x86_64.rpm"
-wayland_egl_sha1="0a42fddd9a58c0bcd93efdaf84fd54b872f050d0"
-wayland_egl_devel_rpm="mesa-libwayland-egl-devel-$version.el7.x86_64.rpm"
-wayland_egl_devel_sha1="3ece8768e6bdd8603ce15d75f3b80895da038f15"
-mirror1="http://ci-files01-hki.intra.qt.io/input/wayland"
-mirror2=$mirror1
-
-echo "Installing libwayland-egl development packages on RHEL"
-
-# We're installing the packages with `--nodeps` because we've already installed
-# the Wayland libraries, but not through the package manager.
-
-DownloadURL $mirror1/$wayland_egl_rpm $mirror2/$wayland_egl_rpm $wayland_egl_sha1 /tmp/$wayland_egl_rpm
-sudo rpm -i --nodeps /tmp/$wayland_egl_rpm
-rm /tmp/$wayland_egl_rpm
-
-DownloadURL $mirror1/$wayland_egl_devel_rpm $mirror2/$wayland_egl_devel_rpm $wayland_egl_devel_sha1 /tmp/$wayland_egl_devel_rpm
-sudo rpm -i --nodeps /tmp/$wayland_egl_devel_rpm
-rm /tmp/$wayland_egl_devel_rpm
-
-echo "mesa-libwayland-egl = $version" >> ~/versions.txt

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.2k"
+opensslVersion="1.0.2o"
 opensslFile="openssl-$opensslVersion.tar.gz"
 opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
 opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
-opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44"
+opensslSha1="a47faaca57b47a0d9d5fb085545857cc92062691"
 
 # Below target location has been hard coded into Coin.
 # QTQAINFRA-1195

coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\set-proxy.ps1"

coin/provisioning/qtci-windows-10-x86/08-libclang.ps1

@@ -1 +1,3 @@
+# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2015

coin/provisioning/qtci-windows-10-x86/09-openssl.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\openssl.ps1"

coin/provisioning/qtci-windows-10-x86/09-postgresql.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\postgresql.ps1"

coin/provisioning/qtci-windows-10-x86/80-win10sdk.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\win10sdk.ps1"