Update submodules on '5.12' in qt/qt5

Change-Id: I1ff53e5054293b41b4149946c8ef8c62ddfc28c9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

coin/platform_configs/default.yaml

@@ -99,7 +99,7 @@
     Features: ['Packaging']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
 -
-    Template: 'qtci-macos-10.13-x86_64-2'
+    Template: 'qtci-macos-10.13-x86_64-3'
     Compiler: 'Clang'
     Features: ['Packaging']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
@@ -113,28 +113,28 @@
     Compiler: 'Clang'
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
 -
-    Template: 'qtci-macos-10.13-x86_64-2'
+    Template: 'qtci-macos-10.13-x86_64-3'
     Target os: 'IOS_ANY'
     Target arch: 'multi'
     Compiler: 'Clang'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
 -
-    Template: 'qtci-macos-10.13-x86_64-2'
+    Template: 'qtci-macos-10.13-x86_64-3'
     Target os: 'TvOS_ANY'
     Target arch: 'multi'
     Compiler: 'Clang'
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang'
 -
-    Template: 'qtci-macos-10.13-x86_64-2'
+    Template: 'qtci-macos-10.13-x86_64-3'
     Target os: 'WatchOS_ANY'
     Target arch: 'multi'
     Compiler: 'Clang'
     Features: ['DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
 -
-    Template: 'qtci-macos-10.13-x86_64-2'
+    Template: 'qtci-macos-10.13-x86_64-3'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'Clang'

coin/platform_configs/installer-framework.yaml

@@ -10,7 +10,7 @@ Configurations:
     Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;']
     Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86']
 -
-    Template: 'qtci-macos-10.13-x86_64-2'
+    Template: 'qtci-macos-10.13-x86_64-3'
     Compiler: 'Clang'
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install'

coin/platform_configs/qt5.yaml

@@ -67,7 +67,7 @@
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a'
 -
-    Template: 'qtci-macos-10.13-x86_64-2'
+    Template: 'qtci-macos-10.13-x86_64-3'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'Clang'
@@ -75,7 +75,7 @@
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a'
 -
-    Template: 'qtci-macos-10.13-x86_64-2'
+    Template: 'qtci-macos-10.13-x86_64-3'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
@@ -83,7 +83,7 @@
     Features: ['Packaging', 'DisableTests']
     Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a'
 -
-    Template: 'qtci-macos-10.13-x86_64-2'
+    Template: 'qtci-macos-10.13-x86_64-3'
     Target os: 'QNX_700'
     Target arch: 'x86'
     Compiler: 'GCC'

coin/provisioning/common/linux/openssl_for_android_linux.sh

@@ -41,6 +41,7 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
+version="1.1.1k"
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.
 if uname -a |grep -q "Ubuntu"; then
@@ -53,11 +54,10 @@ else
     rm -rf "$exports_file"
 fi
 
-version="1.1.1g"
 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"
-sha="b213a293f2127ec3e323fb3cfc0c9807664fd997"
+sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
 opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"

coin/provisioning/common/macos/macos-version.sh

@@ -44,8 +44,6 @@ sw_vers >> ~/versions.txt
 echo "***** All installed packages *****" >> ~/versions.txt
 echo "***** HomeBrew *****" >> ~/versions.txt
 brew list --versions >> ~/versions.txt
-echo "***** HomeBrew Casks*****" >> ~/versions.txt
-brew cask list --versions >> ~/versions.txt
 echo "***** Apple's installer *****" >> ~/versions.txt
 pkgutil --pkgs >> ~/versions.txt
 echo "*********************************************" >> ~/versions.txt

coin/provisioning/common/macos/nodejs.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2021 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$
+##
+#############################################################################
+
+# shellcheck source=./../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+
+# This script will install Nodejs
+
+version="14.16.1"
+urlCache="http://ci-files01-hki.ci.local/input/nodejs/node-v$version.pkg"
+urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
+sha1="4720274971c40fe51b2c647060f77c45fb4949a7"
+
+DownloadURL $urlCache $urlOffcial $sha1 "/tmp/node-v$version.pkg"
+sudo installer -pkg "/tmp/node-v$version.pkg" -target /
+
+ echo "Nodejs = $version" >> ~/versions.txt
+

coin/provisioning/common/macos/pip.sh

@@ -1,11 +1,18 @@
 #!/usr/bin/env bash
 
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+
 function InstallPip {
 
     python=$1
 
     # Will install pip utility for python
-    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+    if [[ $python == "python2.7" ]]; then
+        DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/python27/get-pip.py" "https://bootstrap.pypa.io/2.7/get-pip.py" "c4c5f74586cffe49804f167d95d1710b9750ddf0"
+    else
+        DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/get-pip.py" "https://bootstrap.pypa.io/get-pip.py" "209ddf0bb8d1cf06a1f17dd9f21970c76b3d2be2"
+    fi
     sudo "$python" get-pip.py
     rm get-pip.py
 }

coin/provisioning/common/macos/python3.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Copyright (C) 2017 Pelagicore AG
 ## Contact: http://www.qt.io/licensing/
 ##
@@ -43,23 +43,23 @@ 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"
-SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.7.4-macosx10.9.pkg"
+AltUrl="https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg"
+SHA1="ef8a6b1abba6a6e8553916a881af440705653fa8"
 DestDir="/"
 
 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
 
-InstallPip python3.6
+InstallPip python3.7
 
-/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv wheel
+/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 install virtualenv wheel
 
-SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
-SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
+SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin"
+SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin"
 
 # Install all needed packages in a special wheel cache directory
-/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt
+/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 
-echo "python3 = 3.6.1" >> ~/versions.txt
+echo "python3 = 3.7.4" >> ~/versions.txt
 

coin/provisioning/common/unix/install-openssl.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.1.1g"
+version="1.1.1k"
 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"
-sha="b213a293f2127ec3e323fb3cfc0c9807664fd997"
+sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
 opensslHome="${HOME}/openssl-${version}"
 opensslSource="${opensslHome}-src"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"

coin/provisioning/common/unix/squishInstall.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,141 +33,93 @@
 ##
 #############################################################################
 
+# shellcheck source=./DownloadURL.sh
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+
 set -ex
 
-# This script will install squish package for Linux and Mac.
+# This script will fetch and extract pre-buildt squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.4.3"
-# Branch version without dot
+version="6.6.1"
 qtBranch="512x"
-squishFolder="/opt/squish"
-squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
-squishFile="squish-$version-qt$qtBranch-linux64.run"
+installFolder="/opt"
+squishFolder="$installFolder/squish"
+preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
+licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license"
+licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
 if uname -a |grep -q Darwin; then
-     squishFile="squish-$version-qt$qtBranch-macx86_64.dmg"
+     compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
+     sha1="18d683c8702ec47528e36f8e352bc64b07e7996a"
+else
+     compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
+     sha1="9cb84b7c8d920ced056ce94ce75b0879c29fba22"
 fi
 
-squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
-squishLicenseFile=".squish-3-license.tar.gz"
+mountFolder="/tmp/squish"
+sudo mkdir "$mountFolder"
 
-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"
-    sudo mv "$squishFolder" "/tmp/squish_$(date)"
+# Check which platform
+if uname -a |grep -q Darwin; then
+    usersGroup="staff"
+    squishLicenseDir="/Users/qt"
+elif uname -a |grep -q "el7"; then
+    usersGroup="qt"
+    squishLicenseDir="/root"
+elif uname -a |grep -q "Ubuntu"; then
+    usersGroup="users"
+    squishLicenseDir="/home/qt"
+else
+    usersGroup="users"
+    squishLicenseDir="/root"
 fi
 
-if [ -f "/etc/profile.d/squish_env.sh" ]; then
-    echo "Remove /etc/profile.d/squish_env.sh"
-    sudo rm -f "/etc/profile.d/squish_env.sh"
-    export SQUISH_LICENSEKEY_DIR=$HOME
+targetFileMount="$mountFolder"/"$compressedFolder"
+
+echo "Mounting $preBuildCacheUrl to $mountFolder"
+sudo mount "$preBuildCacheUrl" "$mountFolder"
+echo "Create $installFolder if needed"
+if [ !  -d "$installFolder" ]; then
+    sudo mkdir "$installFolder"
 fi
 
-function MountAndInstall {
-    url=$1
-    targetDirectory=$2
-    targetFile=$3
+VerifyHash "$targetFileMount" "$sha1"
 
-    # Check which platform
-    if uname -a |grep -q Darwin; then
-        usersGroup="staff"
-        mountFolder="/Volumes"
-        squishLicenseDir="/Users/qt"
-    elif uname -a |grep -q "el7"; then
-        usersGroup="qt"
-        mountFolder="/tmp"
-        squishLicenseDir="/root"
-    elif uname -a |grep -q "Ubuntu"; then
-        usersGroup="users"
-        mountFolder="/tmp"
-        squishLicenseDir="/home/qt"
-    else
-        usersGroup="users"
-        mountFolder="/tmp"
-        squishLicenseDir="/root"
-    fi
+echo "Uncompress $compressedFolder"
+sudo tar -xzf "$targetFileMount" --directory "$installFolder"
 
-    function UnMount {
-        echo "Unmounting $mountFolder"
-        sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
-    }
+echo "Unmounting $mountFolder"
+sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
 
-    targetFileMount="$mountFolder"/"$targetFile"
-
-    echo "Mounting $url to $mountFolder"
-    sudo mount "$url" "$mountFolder"
-    echo "Create $targetDirectory if needed"
-    if [ !  -d "/opt" ]; then
-        sudo mkdir "/opt"
-    fi
-    if [ !  -d "$targetDirectory" ]; then
-        sudo mkdir "$targetDirectory"
-    fi
-    echo "Uncompress $targetFile"
-    if [[ $targetFile == *.tar.gz ]]; then
-        if [[ $targetFile == .squish-3-license.* ]]; then
-            target="$squishLicenseDir"
-            # Squish license need to be exists also in users home directory, because squish check it before it starts running tests
-            sudo tar -xzf "$targetFileMount" --directory "$HOME"
-        else
-            target="$targetDirectory"
-        fi
-        sudo tar -xzf "$targetFileMount" --directory "$target"
-        UnMount
-    elif [[ $targetFile == *.dmg ]]; then
-        echo "'dmg-file', no need to uncompress"
-        sudo cp $targetFileMount /tmp
-        UnMount
-        sudo hdiutil attach "/tmp/$targetFile"
-        sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
-        mountFolder="/Volumes/froglogic Squish"
-        UnMount
-    elif [[ $targetFile == *.run ]]; then
-        echo "'run-file', no need to uncompress"
-        sudo cp $targetFileMount $targetDirectory
-        UnMount
-        sudo chmod +x $targetDirectory/$targetFile
-        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
-            sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
-        fi
-    else
-        exit 1
-    fi
-
-    echo "Changing ownerships"
-    sudo chown -R qt:$usersGroup "$targetDirectory"
-    sudo chown qt:$usersGroup "$HOME/.squish-3-license"
-}
-
-echo "Set commands for environment variables in .bashrc"
+sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
 
 if uname -a |grep -q "Ubuntu"; then
-    echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile
-    echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile
-else
-    echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc
-    echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc
+    if [ ! -e "/usr/lib/tcl8.6" ]; then
+        sudo mkdir /usr/lib/tcl8.6
+        sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
+    fi
 fi
 
-echo "Installing squish license to home directory.."
-MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile"
+DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/.squish-3-license"
 
-echo "Installing squish $version.."
-MountAndInstall "$squishUrl" "$squishFolder" "$squishFile"
+echo "Changing ownerships"
+sudo chown -R qt:$usersGroup "$squishFolder"
+sudo chown qt:$usersGroup "$HOME/.squish-3-license"
 
-echo "Installing provisioning scripts 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"
+echo "Set commands for environment variables in .bashrc"
+if uname -a |grep -q "Ubuntu"; then
+    echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile
+    echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile
 else
-    echo "Squish test failed! Package wasn't installed correctly."
+    echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc
+    echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc
+fi
+
+echo "Verifying Squish"
+if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+    echo "Squish for Qt installation tested successfully"
+else
+    echo "Squish for Qt test failed! Package wasn't installed correctly."
     exit 1
 fi
+

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

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -45,30 +45,57 @@ if (Is64BitWinHost) {
 # 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.1.1g"
+$version = "1.1.1k"
 $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
-$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997"
+$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
+$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
+$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945"
 $destination = "C:\Utils\openssl-android-master"
+$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip"
 
 # msys unix style paths
 $ndkPath = "/c/Utils/Android/android-ndk-r19c"
 $openssl_path = "/c/Utils/openssl-android-master"
 $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
-Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
-Verify-Checksum $zip $sha1
+if ((Test-Path $prebuilt_url)) {
+    Download $prebuilt_url $prebuilt_url $prebuilt_zip
+    Verify-Checksum $prebuilt_zip $prebuilt_sha1
+    Extract-7Zip $prebuilt_zip C:\Utils
+    Remove $prebuilt_zip
+} else {
+    Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
+    Verify-Checksum $zip $sha1
 
-Extract-7Zip $zip C:\Utils\tmp
-Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
-Move-Item C:\Utils\tmp\openssl-${version} $destination
-Remove-Item -Path $zip
+    Extract-7Zip $zip C:\Utils\tmp
+    Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
+    Move-Item C:\Utils\tmp\openssl-${version} $destination
+    Remove "$zip"
 
-Write-Host "Configuring OpenSSL $version for Android..."
-Push-Location $destination
-# $ must be escaped in powershell...
-Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
-Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
-Pop-Location
+    Write-Host "Configuring OpenSSL $version for Android..."
+    Push-Location $destination
+    # $ must be escaped in powershell...
+
+    function CheckExitCode {
+
+        param (
+            $p
+        )
+
+        if ($p.ExitCode) {
+            Write-host "Process failed with exit code: $($p.ExitCode)"
+            exit 1
+        }
+    }
+
+    $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
+    CheckExitCode $configure
+
+    $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
+    CheckExitCode $make
+
+    Pop-Location
+    Remove-item C:\Utils\tmp -Recurse -Confirm:$false
+}
 
 Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"
-Remove-item C:\Utils\tmp -Recurse -Confirm:$false
 Write-Output "Android OpenSSL = $version" >> ~/versions.txt

coin/provisioning/common/windows/conan.ps1

@@ -1,7 +1,6 @@
-#############################################################################
+############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
-## Copyright (C) 2019 Konstantin Tokarev <annulen@yandex.ru>
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -30,75 +29,26 @@
 ##
 ## $QT_END_LICENSE$
 ##
-#############################################################################
+############################################################################
 
 . "$PSScriptRoot\helpers.ps1"
 
-$scriptsPath = "C:\Python36\Scripts"
+# This is temporary solution for installing packages provided by Conan until we have fixed Conan setup for this
 
-Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt"
-Write-Output "Conan = 1.29.0" >> ~\versions.txt
+$url_conan = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conan.zip"
+$url_conan_home = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conanhome.zip"
+$sha1_conan_compressed = "1abbe43e7a29ddd9906328702b5bc5231deeb721"
+$sha1_conanhome_compressed = "f44c2ae21cb1c7dc139572e399b7b0eaf492af03"
+$conan_compressed = "C:\.conan.zip"
+$conanhome_compressed = "C:\.conanhome.zip"
 
-# Use Qt Project repository by default
-Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force"
+Download $url_conan $url_conan $conan_compressed
+Verify-Checksum $conan_compressed $sha1_conan_compressed
+Extract-7Zip $conan_compressed C:\
 
-Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos"
+Download $url_conan_home $url_conan_home $conanhome_compressed
+Verify-Checksum $conanhome_compressed $sha1_conanhome_compressed
+Extract-7Zip $conanhome_compressed C:\Users\qt
 
-function Run-Conan-Install
-{
-    Param (
-        [string]$ConanfilesDir,
-        [string]$BuildinfoDir,
-        [string]$Arch,
-        [string]$Compiler,
-        [string]$CompilerVersion,
-        [string]$CompilerRuntime,
-        [string]$CompilerLibcxx,
-        [string]$CompilerException,
-        [string]$CompilerThreads
-    )
-
-    if ($CompilerRuntime) {
-        $extraArgs += " -s compiler.runtime=$CompilerRuntime"
-    }
-
-    if ($CompilerLibcxx) {
-        $extraArgs += " -s compiler.libcxx=$CompilerLibcxx"
-    }
-
-    if ($CompilerException) {
-        $extraArgs += " -s compiler.exception=$CompilerException"
-    }
-
-    if ($CompilerThreads) {
-        $extraArgs += " -s compiler.threads=$CompilerThreads"
-    }
-
-    $manifestsDir = "$PSScriptRoot\conan_manifests"
-    $buildinfoRoot = "C:\Utils\conanbuildinfos"
-
-    Get-ChildItem -Path "$ConanfilesDir\*.txt" |
-    ForEach-Object {
-        $conanfile = $_.FullName
-        $outpwd = "$buildinfoRoot\$BuildinfoDir\$($_.BaseName)"
-        New-Item $outpwd -Type directory -Force | Out-Null
-
-        for ($i = 1; $i -le 5; $i++) {
-            try {
-                Push-Location $outpwd
-                Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", `
-                    '-s', ('compiler="' + $Compiler + '"'), `
-                    "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile"
-                break;
-            } catch {
-                if ($i -eq 5) {
-                    throw "Could not install conan content"
-                }
-            } finally {
-                Pop-Location
-            }
-        }
-
-        Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
-    }
-}
+Remove $conan_compressed
+Remove $conanhome_compressed

coin/provisioning/common/windows/disable-netadapterlso.ps1

@@ -0,0 +1 @@
+Disable-NetAdapterLso Ethernet

coin/provisioning/common/windows/install-azure-tool.ps1

@@ -1,7 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Copyright (C) 2017 Pelagicore AG
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -31,14 +30,11 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+. "$PSScriptRoot\helpers.ps1"
 
-. "$PSScriptRoot\..\common\windows\helpers.ps1"
+# This script will install Azure singtool using Dotnet SDK
+$dotnet = "C:\Program Files\dotnet\dotnet.exe"
 
-# Signing tools are needed to sign offline installers when releasing
+$version = "2.0.17"
+Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version"
 
-$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip"
-$destination = "C:\Windows\temp\sign.zip"
-
-Download $url $url $destination
-Extract-7Zip "$destination" "C:\Utils"
-Remove-Item -Path "$destination"

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

@@ -0,0 +1,59 @@
+#############################################################################
+##
+## Copyright (C) 2020 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 Dotnet SDK which is required for Azure installation
+
+$version = "2.1"
+if (Is64BitWinHost) {
+    $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe"
+    $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe"
+    $sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8"
+} else {
+    $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe"
+    $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe"
+    $sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161"
+}
+$installer = "C:\Windows\Temp\dotnet-sdk-$version.exe"
+
+Write-Host "Installing Dotnet SDK $version"
+Download $urlOfficial $urlCache $installer
+Verify-Checksum $installer $sha1
+Run-Executable "$installer" "/install /passive"
+Prepend-Path "C:\Program Files\dotnet"
+Remove $installer
+
+Write-Output "Dotnet SDK = $version" >> ~/versions.txt
+
+
+

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

@@ -33,40 +33,50 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-$version = "20181211"
+# This script will installs msys2
+
+$version = "20200903"
 $prog = "msys2"
-if (Is64BitWinHost) {
-    $arch = "x86_64"
-    $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2"
-    $folder = "msys64"
-} else {
-    $arch = "i686"
-    $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e"
-    $folder = "msys32"
-}
+$arch = "x86_64"
+$sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03"
+$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
+$folder = "msys64"
+
+$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z"
 $package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
 
-
+$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt"
 $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
 $url_official = "http://repo.msys2.org/distrib/$arch/$package"
-$PackagePath = "C:\Windows\Temp\$package"
 $TargetLocation = "C:\Utils"
 
 
-Download $url_official $url_cache $PackagePath
-Verify-Checksum $PackagePath $sha1
-Extract-tar_gz $PackagePath $TargetLocation
-$bash = "$TargetLocation\$folder\usr\bin\bash"
+if ((Test-Path $url_cache_prebuilt)) {
+    $PackagePath = "C:\Windows\Temp\$package_prebuilt"
+    Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath
+    Verify-Checksum $PackagePath $sha1_prebuilt
+    Extract-7Zip $PackagePath $TargetLocation
+} else {
+    $PackagePath = "C:\Windows\Temp\$package"
+    Download $url_official $url_cache $PackagePath
+    Verify-Checksum $PackagePath $sha1
+    Extract-tar_gz $PackagePath $TargetLocation
+    $msys = "$TargetLocation\$folder\msys2_shell.cmd"
 
-# install perl
-Run-Executable "$bash" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
-Run-Executable "$bash" "`"-l`" `"-c`" `"yes | cpan -i Text::Template Test::More`""
+    # install perl
+    # Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
+    cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
+    Start-Sleep -s 60
+    cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
+
+    # Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
+    # Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
+    Start-Sleep -s 360
+    if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
+    if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
+}
 
 Write-Host "Cleaning $PackagePath.."
 Remove-Item -Recurse -Force -Path "$PackagePath"
 
-# pacman-key launches gpg-agent and dirmngr in the background, see https://github.com/Alexpux/MSYS2-pacman/issues/56
-Stop-Process -Name "gpg-agent" -ErrorAction Ignore
-Stop-Process -Name "dirmngr" -ErrorAction Ignore
-
 Write-Output "MSYS2 = $version" >> ~\versions.txt

coin/provisioning/common/windows/openssl.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -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_1_1g"
+$version = "1_1_1k"
 $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 = "7643561c372720f55de51454a707ede334db086e"
+    $sha1 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041"
 
     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 = "c7d4b096c2413d1af819ccb291214fa3c4cece07"
+$sha1 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371"
 
 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86

coin/provisioning/common/windows/python.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -54,8 +54,30 @@ $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$versio
 Write-Host "Fetching from URL..."
 Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
-Write-Host "Installing $package..."
-Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1"
+
+# Python installation is flaky, but seems to pass with second run if error occurs.
+$stop = $false
+[int]$retry = "0"
+do {
+    try {
+        # /levx = e:'All error messages' v:'Verbose' x:'Extra debugging info'
+        Run-Executable "msiexec" "/passive /i $package /levx C:\Windows\Temp\Python_log.log TARGETDIR=$targetDir ALLUSERS=1"
+        $stop = $true
+    }
+    catch {
+        Get-Content C:\Windows\Temp\Python_log.log -Tail 50
+        if ($retry -gt 2) {
+        Write-Host "Python installation failed!"
+        throw
+        }
+        else {
+            Write-Host "Couldn't install python, retrying in 30 seconds"
+            Start-Sleep -s 30
+            $retry = $retry + 1
+        }
+    }
+}
+while ($stop -ne $true)
 
 # 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'..."

coin/provisioning/common/windows/python3.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Copyright (C) 2017 Pelagicore AG
 ## Contact: http://www.qt.io/licensing/
 ##
@@ -40,7 +40,7 @@ param(
 )
 . "$PSScriptRoot\helpers.ps1"
 
-$version = "3.6.1"
+$version = "3.6.2"
 $package = "C:\Windows\temp\python-$version.exe"
 
 # check bit version
@@ -48,11 +48,11 @@ if ( $archVer -eq 64 ) {
     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"
+    $sha1 = "bcf9bda733a9153811209c62d628c41ab6cedbe2"
 } else {
     $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe"
     $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe"
-    $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1"
+    $sha1 = "cd9744b142eca832f9534390676e6cfb84bf655d"
 }
 
 Write-Host "Fetching from URL..."

coin/provisioning/common/windows/squishInstall.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,122 +33,48 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-# This script will install squish package for Windows.
+# This script will pre-installed squish package for Windows.
 # Squish is need by Release Test Automation (RTA)
-# NOTE! Make sure 64bit versions are always installed before 32bit,
-# because they use same folder name before a rename
 
-$version = "6.4.3"
-
-# Qt branch without dot (*.*)
+$version = "6.6.1"
 $qtBranch = "512x"
-# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point
-# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
-
 $targetDir = "C:\Utils\squish"
-$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
-$squishBranchUrl = "$squishUrl\$qtBranch"
-$testSuite = "suite_test_squish"
-$testSuiteUrl = "$squishUrl\$testSuite.7z"
+$squishPackage = "C:\Utils\rta_squish"
+$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable"
+$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
 
 # Squish license
 $licensePackage = ".squish-3-license"
 
+Write-Host "Installing Squish license to home directory"
+Copy-Item $licenseUrl\$licensePackage ~\$licensePackage
+
+if (Is64BitWinHost) {
+     $arch = "x64"
+} else {
+    $arch = "x86"
+}
+
 $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName
 
-Function DownloadAndInstallSquish {
-    Param (
-        [string]$version,
-        [string]$bit,
-        [string]$squishPackage
-    )
-    # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13
-    if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
-        $qtBranch = "511x"
-    }
-    $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
-    $SquishInstaller = "$targetDir\$squishPackage.exe"
-    $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
-
-    Write-Host "Fetching from URL $squishUrl"
-    Copy-Item "$SquishUrl" "$SquishInstaller"
-    Write-Host "Installing Squish"
-    Run-Executable "$SquishInstaller" "$SquishParameters"
-    Remove-Item -Path $SquishInstaller
-    if ("$bit" -eq "win64") {
-        if ($squishPackage.StartsWith("mingw")) {
-            $squishPackage64bit = "mingw_64"
-        } else {
-            $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
-        }
-    }
-}
-
-Function DownloadSquishLicence {
-    Param (
-        [string]$squishUrl
-    )
-
-    Write-Host "Installing Squish license to home directory"
-    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") {
-
+    $winVersion = "win10"
     if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 "msvc14"
-        DownloadAndInstallSquish $version win64 "msvc141"
-        DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh"
+        $sha1 = "13cb5b6a71d915213fac4273c99c83406b03985f"
     } else {
-        DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
+        $sha1 = "33484220762110b2fce1a1f9042f27358cb23929"
     }
-    DownloadAndInstallSquish $version win32 "msvc141"
-
-} elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
-
-    if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 "msvc14"
-    }
-    DownloadAndInstallSquish $version win32 "msvc141"
-
 } elseif ($OSVersion -eq "Windows 7 Enterprise") {
-
-    if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 "msvc14"
-    } else {
-        DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
-    }
-    DownloadAndInstallSquish $version win32 "msvc141"
+    $winVersion = "win7"
+    $sha1 = "05d6255b090eace35cf1e899ea203e9182cccccd"
 }
+$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip"
+
+Copy-Item "$squishUrl\$squishArchive" "C:\Utils"
+Verify-Checksum "C:\Utils\$squishArchive" $sha1
+Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils"
+Rename-Item "$squishPackage" "$targetDir"
+
+Write-Host "Verifying Squish Installation for following targets:"
+get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { $_.FullName }
+get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { if (cmd /c $_.FullName --testsuite "$targetDir\suite_test_squish" |Select-String -Pattern "Squish test run successfully") { Write-Host "Squish tested successfully"} else { [Environment]::Exit(1) } }

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -44,3 +44,5 @@ installPackages+=(openssl-devel)
 
 sudo yum -y install "${installPackages[@]}"
 
+gccVersion="$(gcc --version |grep gcc |cut -b 11-16)"
+echo "GCC = $gccVersion" >> versions.txt

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -122,9 +122,12 @@ 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 --upgrade "pip < 21.0"
 sudo pip install virtualenv wheel
 
+# Needed by packaging scripts
+sudo /usr/local/bin/pip3 install colorlog --user
+
 sudo /usr/local/bin/pip3 install wheel
 # Install all needed packages in a special wheel cache directory
 /usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
@@ -132,3 +135,7 @@ sudo /usr/local/bin/pip3 install wheel
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+
+gccVersion="$(gcc --version |grep gcc |cut -b 11-16)"
+echo "GCC = $gccVersion" >> versions.txt
+

coin/provisioning/qtci-linux-SLES-12-x86_64/02-enable-modules.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2021 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$
+##
+#############################################################################
+
+set -e
+
+curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/suse_rk.sh -o "/tmp/suse_rk.sh" &>/dev/null
+sudo chmod 755 /tmp/suse_rk.sh
+/tmp/suse_rk.sh
+
+# Activate these modules
+# sudo SUSEConnect -p PackageHub/12.4/x86_64
+sudo SUSEConnect -p sle-module-toolchain/12/x86_64
+sudo SUSEConnect -p sle-sdk/12.4/x86_64
+sudo SUSEConnect -p sle-module-legacy/12/x86_64
+# This is needed by Nodejs and QtWebEngine
+sudo SUSEConnect -p sle-module-web-scripting/12/x86_64
+
+sudo rm -f /tmp/suse_rk.sh

coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -94,3 +94,5 @@ sudo zypper -nq install libfreetds freetds-devel
 # sqlite2 support
 sudo zypper -nq install sqlite2 sqlite2-devel
 
+gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
+echo "GCC = $gccVersion" >> versions.txt

coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -41,12 +41,45 @@ set -ex
 
 sudo zypper -nq install python-devel
 
-wget -q https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
-sed -i 's/12.3/12.4/g' build_python3.sh
-bash build_python3.sh
+# Selected installation instructions coming from:
+# https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
+export PACKAGE_NAME="python"
+export PACKAGE_VERSION="3.7.2"
+(
 
-export
-python3 --version
+    sudo zypper install -y  gcc gcc-c++ make ncurses patch wget tar zlib-devel zlib libffi-devel libopenssl-devel
+
+    printf -- 'Configuration and Installation started \n'
+
+    #Downloading Source code
+    wget "https://www.python.org/ftp/${PACKAGE_NAME}/${PACKAGE_VERSION}/Python-${PACKAGE_VERSION}.tar.xz"
+    tar -xvf "Python-${PACKAGE_VERSION}.tar.xz"
+
+    #Configure and Build
+    cd "Python-${PACKAGE_VERSION}"
+    ./configure --prefix=/usr/local --exec-prefix=/usr/local
+    make
+    sudo make install
+
+    export PATH="/usr/local/bin:${PATH}"
+    printf -- '\nInstalled python successfully \n'
+
+    #Cleanup
+    cd -
+    rm "Python-${PACKAGE_VERSION}.tar.xz"
+
+    #Verify python installation
+    if command -V "$PACKAGE_NAME"${PACKAGE_VERSION:0:1} >/dev/null
+    then
+        printf -- "%s installation completed. Please check the Usage to start the service.\n" "$PACKAGE_NAME"
+    else
+        printf -- "Error while installing %s, exiting with 127 \n" "$PACKAGE_NAME"
+        exit 127
+    fi
+)
+
+
+python3 --version | fgrep "$PACKAGE_VERSION"
 
 pip3 install --user wheel
 pip3 install --user virtualenv

coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh

@@ -76,7 +76,7 @@ ARCH_SELECTED=ALL
 COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset
 EOT
 
-(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu)
+(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu --ignore-signature)
 
 # Export LD_LIBRARY_PATH to Coin
 echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc

coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2021 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$
+##
+#############################################################################
+
+set -e
+
+curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/suse_rk.sh -o "/tmp/suse_rk.sh" &>/dev/null
+sudo chmod 755 /tmp/suse_rk.sh
+/tmp/suse_rk.sh
+
+# Activate these modules
+sudo SUSEConnect -p sle-module-desktop-applications/15/x86_64
+sudo SUSEConnect -p sle-module-development-tools/15/x86_64
+# This is needed by Nodejs and QtWebEngine
+sudo SUSEConnect -p sle-module-web-scripting/15/x86_64
+
+sudo rm -f /tmp/suse_rk.sh

coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -95,3 +95,12 @@ sudo zypper -nq install unixODBC-devel unixODBC
 # sqlite support
 sudo zypper -nq install sqlite3 sqlite3-devel
 
+# Java - needed by RTA jenkins
+sudo zypper -nq install java
+
+# open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot.
+sudo zypper -nq update open-vm-tools
+
+gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
+echo "GCC = $gccVersion" >> versions.txt
+

coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh

@@ -76,7 +76,7 @@ ARCH_SELECTED=ALL
 COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset
 EOT
 
-(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu)
+(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu --ignore-signature)
 
 # Export LD_LIBRARY_PATH to Coin
 echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -56,3 +56,5 @@ sudo apt-get update
 echo "Installing packages"
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
 
+gccVersion="$(gcc --version |grep gcc |cut -b 13-17)"
+echo "GCC = $gccVersion" >> versions.txt

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -186,3 +186,6 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+
+gccVersion="$(gcc --version |grep gcc |cut -b 13-17)"
+echo "GCC = $gccVersion" >> versions.txt

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

@@ -67,3 +67,6 @@ sudo zypper -nq install libpulse-devel
 
 # cups
 sudo zypper -nq install cups-devel
+
+gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
+echo "GCC = $gccVersion" >> versions.txt

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

@@ -76,7 +76,7 @@ ARCH_SELECTED=ALL
 COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset
 EOT
 
-(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu)
+(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu --ignore-signature)
 
 # Export LD_LIBRARY_PATH to Coin
 echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc

coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh

@@ -4,4 +4,4 @@
 set -ex
 
 brew update
-brew install p7zip
+brew install --build-from-source p7zip

coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -97,4 +97,16 @@ 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
 
 sudo systemsetup settimezone GMT
+# Setting Time Zone seems to be flaky in macOS 10.13. Checking that Time Zone is correct. If not, reset it.
+if [[ $(sudo systemsetup -gettimezone) = *GMT* ]]; then
+    echo "Time Zone is GMT"
+else
+    echo "Wrong Time Zone. Reset Time Zone to GMT"
+    sleep 5
+    sudo systemsetup settimezone GMT
+        if [[ $(sudo systemsetup -gettimezone) != *GMT* ]]; then
+            echo "Couldn't set Time Zone!"
+            exit 1
+        fi
+fi
 sudo rm -f "$targetFile"

coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh

@@ -4,4 +4,4 @@
 set -ex
 
 brew update
-brew install p7zip
+brew install --build-from-source p7zip

coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/nodejs.sh"

coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1

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

coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1

@@ -0,0 +1,2 @@
+# Allow SMB client guest logons to SMB server.
+reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F

coin/provisioning/qtci-windows-10-x86/11-conan.ps1

@@ -1,17 +1 @@
 . "$PSScriptRoot\..\common\windows\conan.ps1"
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir MSVC2015-x86 `
-    -Arch x86 `
-    -Compiler "Visual Studio" `
-    -CompilerVersion 14 `
-    -CompilerRuntime MD
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir MSVC2017-x86 `
-    -Arch x86 `
-    -Compiler "Visual Studio" `
-    -CompilerVersion 15 `
-    -CompilerRuntime MD

coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1

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

coin/provisioning/qtci-windows-10-x86_64/01-disable-runtimebroker.ps1

@@ -0,0 +1,4 @@
+# Disable RunTime Broker
+# The RunTime Broker is a Windows system process, which helps to manage app permissions on your pc between Windows apps and ensures apps are behaving themselves.
+# Coordinates execution of background work for WinRT application. If this service is stopped or disabled, then background work might not be triggered.
+reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TimeBrokerSvc" /V Start /T REG_dWORD /D 4 /F

coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1

@@ -0,0 +1,2 @@
+# Allow SMB client guest logons to SMB server.
+reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F

coin/provisioning/qtci-windows-10-x86_64/10-install-vcredist.ps1

@@ -0,0 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
+
+# This script will install VC Redistributable
+
+$sha1 = "a55510a8c9708b2c68b39cd50bbcaf86e2c885f0"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VC_redist.x64.exe"
+# https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads
+$url_official = "https://aka.ms/vs/16/release/vc_redist.x64.exe"
+$package = "C:\Windows\Temp\vc_redist.x64.exe"
+
+Download $url_official $url_cache $package
+Verify-Checksum $package $sha1
+Run-Executable "$package" "/install /quiet /norestart"
+
+Remove-Item -Recurse -Force -Path $package

coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1

@@ -1,53 +1 @@
 . "$PSScriptRoot\..\common\windows\conan.ps1"
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir MSVC2015-x86_64 `
-    -Arch x86_64 `
-    -Compiler "Visual Studio" `
-    -CompilerVersion 14 `
-    -CompilerRuntime MD
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir MSVC2015-x86 `
-    -Arch x86 `
-    -Compiler "Visual Studio" `
-    -CompilerVersion 14 `
-    -CompilerRuntime MD
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir MSVC2017-x86_64 `
-    -Arch x86_64 `
-    -Compiler "Visual Studio" `
-    -CompilerVersion 15 `
-    -CompilerRuntime MD
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir MSVC2017-x86 `
-    -Arch x86 `
-    -Compiler "Visual Studio" `
-    -CompilerVersion 15 `
-    -CompilerRuntime MD
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir Mingw73-x86 `
-    -Arch x86 `
-    -Compiler "gcc" `
-    -CompilerVersion 8 `
-    -CompilerLibcxx "libstdc++" `
-    -CompilerException "dwarf2" `
-    -CompilerThreads "posix"
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir Mingw-x86_64 `
-    -Arch x86_64 `
-    -Compiler "gcc" `
-    -CompilerVersion 8 `
-    -CompilerLibcxx "libstdc++" `
-    -CompilerException "seh" `
-    -CompilerThreads "posix"

coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1

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

coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1"

coin/provisioning/qtci-windows-7-x86/11-conan.ps1

@@ -1,11 +1 @@
 . "$PSScriptRoot\..\common\windows\conan.ps1"
-
-Run-Conan-Install `
-    -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir Mingw-x86 `
-    -Arch x86 `
-    -Compiler "gcc" `
-    -CompilerVersion 8 `
-    -CompilerLibcxx "libstdc++" `
-    -CompilerException "dwarf2" `
-    -CompilerThreads "posix"

coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1

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

coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1

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