Update submodules on '5.9' in qt5

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

.gitmodules

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

coin/platform_configs/default.txt

@@ -1,27 +1,25 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release DisableTests
 qtci-windows-10-x86_64-10                                           MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
 qtci-windows-7-x86-3                                                Mingw53     DeveloperBuild Release OpenGLDynamic
 qtci-windows-10-x86_64-10                               x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10                                           MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10           WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-10           WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                                           MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         NoWidgets ForceDebugInfo
 qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
 qtci-linux-openSUSE-42.3-x86_64                                     GCC         DeveloperBuild NoPch
-qtci-linux-openSUSE-42.3-x86_64                                     ICC_18      DeveloperBuild NoPch DisableTests SystemSQLite
+qtci-linux-openSUSE-42.3-x86_64                                     ICC_18      DeveloperBuild NoPch DisableTests
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
-qtci-linux-RHEL-7.4-x86_64                                          GCC         Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
-qtci-macos-10.12-x86_64-8                                           Clang       Packaging DebugAndRelease Release
+qtci-linux-RHEL-7.4-x86_64                                          GCC         Packaging Release NoUseGoldLinker
+qtci-macos-10.12-x86_64-9                                           Clang       Packaging DebugAndRelease Release
 qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch
-qtci-osx-10.11-x86_64-3                                             Clang       Release NoFramework DisableTests
-qtci-macos-10.12-x86_64-8           IOS_ANY             multi       Clang       Release DisableTests Static
-qtci-macos-10.12-x86_64-8           TvOS_ANY            multi       Clang       Release DisableTests
-qtci-macos-10.12-x86_64-8           WatchOS_ANY         multi       Clang       Release DisableTests
+qtci-osx-10.10-x86_64                                               Clang       Release NoFramework DisableTests
+qtci-macos-10.12-x86_64-9           IOS_ANY             x86_64      Clang       Release DisableTests Static
 qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                armv7       GCC         Release
 qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                arm64       GCC         Release
 qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         TestOnly LicenseCheck
+qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-RHEL-7.4-x86_64          INTEGRITY_11_04     armv7       GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64          QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qt5.txt

@@ -1,23 +1,24 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-8.1-x86_64                         x86         MSVC2013    DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-8.1-x86_64                                     MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                                   MSVC2017    Packaging 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
 qtci-windows-7-x86-3        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   QNX_700             x86         GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
-qtci-macos-10.12-x86_64-8   TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
-qtci-macos-10.12-x86_64-8   WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
+qtci-macos-10.12-x86_64-9   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-9   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-macos-10.12-x86_64-9   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
 qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             armv8       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-windows-10-x86_64-10   QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qtwebkit.txt

@@ -1,4 +1,5 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10                                   MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests

coin/provisioning/common/linux/android_linux.sh

@@ -37,11 +37,8 @@
 
 # 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"
@@ -81,11 +78,10 @@ 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_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"
+    proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1)
+    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"
 else
     echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
 fi
@@ -95,14 +91,7 @@ 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"
-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
-./avdmanager list avd

coin/provisioning/common/linux/cmake_linux.sh

@@ -37,9 +37,7 @@
 
 # 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"
@@ -52,6 +50,3 @@ 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/disable_selinux.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 # We need to disable selinux while we are overwriting some binaries
 # required by it. If this is not done, ICU provisioning will create
 # template that is not booting.

coin/provisioning/common/linux/fbx_linux.sh

@@ -34,10 +34,7 @@
 #############################################################################
 
 # 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,9 +35,7 @@
 
 # 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

@@ -1,73 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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 +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
-else
-    source ~/.bashrc
-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"
-
-sudo pip install --upgrade pip
-sudo pip install six
-
-git clone https://github.com/open62541/open62541.git open62541
-cd open62541
-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 ..
-make
-
-sudo make install
-sudo /sbin/ldconfig
-
-SetEnvVar "QTOPCUA_OPEN62541_LIB_PATH" "/usr/local/lib/open62541"
-SetEnvVar "QTOPCUA_OPEN62541_INCLUDE_PATH" "/usr/local/include/open62541"
-

coin/provisioning/common/linux/openssl_for_android_linux.sh

@@ -41,12 +41,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.0.2o"
+version="1.0.2p"
 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="a47faaca57b47a0d9d5fb085545857cc92062691"
+sha="f34b5322e92415755c7d58bf5d0d5cf37666382c"
 # 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
@@ -56,9 +56,8 @@ 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}o" "${opensslHome}"
+mv "${opensslHome}p" "${opensslHome}"
 pushd "$opensslHome"
-
 echo "Running configure"
 perl Configure shared android
 

coin/provisioning/common/linux/qnx_660.sh

@@ -40,8 +40,8 @@ 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"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660-patch4687-linux.tar.gz"
+sha1="ffcf91489699c42ce9c1d74941f1829531752bbe"
 folderName="qnx660"
 targetFile="qnx660.tar.gz"
 wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"

coin/provisioning/common/linux/qnx_700.sh

@@ -37,15 +37,14 @@
 
 set -ex
 
-# shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 targetFolder="/opt/"
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz"
-sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz"
+sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c"
 folderName="qnx700"
 targetFile="qnx700.tar.xz"
-wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
+wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile"
 echo "$sha1  $targetFile" | sha1sum --check
 if [ ! -d "$targetFolder" ]; then
     mkdir -p $targetFolder
@@ -60,7 +59,6 @@ if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
 fi
 
 rm -rf $targetFile
-
 # Set env variables
 SetEnvVar "QNX_700" "$targetFolder$folderName"
 

coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh

@@ -39,7 +39,7 @@
 
 set -ex
 
-# shellcheck source=../unix/DownloadURL.sh
+# shellcheck source=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"
-    /usr/bin/shasum --check "$targetFile.sha1"
+    echo "$expectedSha1 *$targetFile" > $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,6 +48,8 @@ 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,7 +32,6 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-# shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 set -ex
 
@@ -45,19 +44,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 -pkg ./*.pkg -target / -allowUntrusted
     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/install_xcode_9_orHigher.sh

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

coin/provisioning/common/macos/python2.sh

@@ -37,7 +37,7 @@
 
 # shellcheck source=./InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
+# shellcheck source=./../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 # shellcheck source=./pip.sh
 source "${BASH_SOURCE%/*}/pip.sh"
@@ -49,7 +49,7 @@ DestDir="/"
 
 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
 
-InstallPip python2.7
+InstallPip /Library/Frameworks/Python.framework/Versions/2.7/bin/python
 
 /Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv
 

coin/provisioning/common/macos/python3.sh

@@ -38,7 +38,7 @@
 
 # shellcheck source=./InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
+# shellcheck source=./../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 # shellcheck source=./pip.sh
 source "${BASH_SOURCE%/*}/pip.sh"
@@ -50,7 +50,7 @@ DestDir="/"
 
 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
 
-InstallPip python3.6
+InstallPip /Library/Frameworks/Python.framework/Versions/3.6/bin/python3
 
 /Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv
 

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

@@ -45,6 +45,5 @@
 #     /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="6.0"
+libclang_version="4.0"

coin/provisioning/common/unix/DownloadURL.sh

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

coin/provisioning/common/unix/check_and_set_proxy.sh

@@ -34,7 +34,6 @@
 
 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,13 +40,10 @@
 # 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")
-# shellcheck source=../shared/sw_versions.txt
-. "$BASEDIR/../shared/sw_versions.txt"
+. $BASEDIR/../shared/sw_versions.txt
 url=$1
 sha1=$2
 version=$3
@@ -55,8 +52,8 @@ if [ $# -eq 0 ]
     # The default values are for macOS package
     echo "Using macOS defaults"
     version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z"
-    sha1="10e48167b61726b20517172f8aff80fa1d9a379b"
+    url="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z"
+    sha1="4781d154b274b2aec99b878c364f0ea80ff00a80"
 fi
 
 zip="libclang.7z"
@@ -64,16 +61,10 @@ 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/
-rm -rf "$zip"
+7z x $zip -o/tmp/
+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/mqtt_broker.sh

@@ -1,55 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-# This script installs paho testing broker
-
-# shellcheck source=./InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
-AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
-SHA1="532fe145096cdd8d679f425cbfd883289150c968"
-targetFolder="/opt/paho_broker"
-appPrefix="paho.mqtt.testing-$CommitSHA"
-
-sudo rm -fr "$targetFolder"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-
-echo "Adding MQTT broker path to environment"
-SetEnvVar "MQTT_TEST_BROKER_LOCATION" "$targetFolder/interoperability/startbroker.py"
-
-echo "MQTT_BROKER = $CommitSHA" >> ~/versions.txt

coin/provisioning/common/unix/squishInstall.sh

@@ -38,7 +38,7 @@ set -ex
 # This script will install squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.3.0"
+version="6.5.1"
 # Branch version without dot
 qtBranch="59x"
 squishFolder="/opt/squish"
@@ -51,9 +51,6 @@ 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"
@@ -93,7 +90,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"
@@ -112,19 +109,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 umount "$mountFolder"
+        sudo cp $targetFileMount /tmp
+        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 umount "$mountFolder"
-        sudo "$targetDirectory/$targetFile" unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
+        sudo cp $targetFileMount $targetDirectory
+        sudo umount $mountFolder
+        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
@@ -143,10 +140,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:$squishFolder/squish-$version/bin" >> ~/.profile
+    echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.profile
 else
     echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc
-    echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc
+    echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.bashrc
 fi
 
 echo "Installing squish license to home directory.."
@@ -154,14 +151,3 @@ 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,5 +56,3 @@ 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,12 +1,10 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = Get-DownloadLocation "Qt3DStudio-3rdparty-win64-CI.zip"
+$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"
 
-$url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip"
-
-Download $url $url $zip
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip
 Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
-Extract-7Zip $zip C:\Utils\Qt3DStudio3rdparty
+Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty
 Remove-Item -Path $zip
 
 Set-EnvironmentVariable "QT3DSTUDIO_3RDPARTY_DIR" "C:/Utils/Qt3DStudio3rdparty"

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

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

coin/provisioning/common/windows/android.ps1

@@ -66,7 +66,7 @@ function Install($1, $2, $3, $4) {
 
     Download $offcialUrl $cacheUrl $zip
     Verify-Checksum $zip "$checksum"
-    Extract-7Zip $zip C:\Utils
+    Extract-Zip $zip C:\Utils
 }
 
 function SdkUpdate ($1, $2) {
@@ -91,16 +91,10 @@ SdkUpdate $sdkFolder platform-tools
 SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion
 
 # kill adb. This process prevents provisioning to continue
-$p = Get-Process -Name "adb" -ErrorAction:SilentlyContinue
+$p = Get-Process -Name "adb.exe" -ErrorAction:SilentlyContinue
 if ($p -ne $null) {
     Write-Host "Stopping adb.exe"
     Stop-Process -Force $p
 } 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 = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
+$zip = "c:\users\qt\downloads\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-7Zip $zip C:
+Extract-Zip $zip C:
 $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
 Rename-Item $defaultinstallfolder C:\CMake
 

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

@@ -1,35 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-. "$PSScriptRoot\helpers.ps1"
-
-Get-WmiObject Win32_OSRecoveryConfiguration -EnableAllPrivileges | Set-WmiInstance -Arguments @{ AutoReboot=$False }

coin/provisioning/common/windows/exceutequeueditems.ps1

@@ -1,39 +0,0 @@
-#############################################################################
-##
-## 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"
-
-Start-Process -NoNewWindow -FilePath "C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\ngen.exe" -ArgumentList ExecuteQueuedItems -Wait
-
-if( (is64bitWinHost) -eq 1 ) {
-   Start-Process -NoNewWindow -FilePath "C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319\ngen.exe" -ArgumentList ExecuteQueuedItems -Wait
-}

coin/provisioning/common/windows/helpers.ps1

@@ -38,8 +38,7 @@ function Extract-7Zip
 {
     Param (
         [string]$Source,
-        [string]$Destination,
-        [string]$Filter
+        [string]$Destination
     )
     Write-Host "Extracting '$Source' to '$Destination'..."
 
@@ -55,10 +54,47 @@ function Extract-7Zip
         $zipExe = "7z.exe"
     }
 
-    if ([string]::IsNullOrEmpty($Filter)) {
     Run-Executable "$zipExe" "x -y `"-o$Destination`" `"$Source`""
+}
+
+function Extract-Zip
+{
+    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 {
-        Run-Executable "$zipExe" "x -y -aoa `"-o$Destination`" `"$Source`" $Filter"
+            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)
     }
 }
 
@@ -68,17 +104,6 @@ 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 (
@@ -87,6 +112,7 @@ function Download
         [string] $Destination = $(BadParam("a download target location"))
     )
     $ProgressPreference = 'SilentlyContinue'
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
     try {
         Write-Host "Downloading from cached location ($CachedUrl) to $Destination"
         if ($CachedUrl.StartsWith("http")) {
@@ -109,7 +135,6 @@ function Add-Path
 
     $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
     [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine)
-    $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
 }
 
 function Set-EnvironmentVariable
@@ -128,10 +153,29 @@ function Is64BitWinHost
     return [environment]::Is64BitOperatingSystem
 }
 
-function IsProxyEnabled {
+function isProxyEnabled {
     return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyEnable
 }
 
-function Get-Proxy {
+function getProxy {
     return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
 }
+
+function Remove {
+
+    Param (
+        [string]$Path = $(BadParam("a path"))
+    )
+    Write-Host "Removing $Path"
+    $i = 0
+    While ( Test-Path($Path) ){
+        Try{
+            remove-item -Force -Recurse -Path $Path -ErrorAction Stop
+        }catch{
+            $i +=1
+            if ($i -eq 5) {exit 1}
+            Write-Verbose "$Path locked, trying again in 5"
+            Start-Sleep -seconds 5
+        }
+    }
+}

coin/provisioning/common/windows/icu.ps1

@@ -39,9 +39,51 @@ $version = "53_1"
 
 if (Is64BitWinHost) {
 
+   $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z"
+   $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z"
+   $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F"
+
+   $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z"
+
+   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) {
+      Write-Host "Fetching from URL ..."
+      Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64
+      Verify-Checksum $icuPackage_msvc2013_64 $sha1_2013
+      Get-ChildItem $icuPackage_msvc2013_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_64_devel\""}
+
+      Write-Host "Cleaning $icuPackage_msvc2013_64..."
+      Remove-Item -Recurse -Force $icuPackage_msvc2013_64
+
+      Write-Output "ICU MSVC2013 = $version" >> ~\versions.txt
+   }
+
+# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
+
 # FIXME: do we really want to use the 4.8.2 ICU build?
 Set-EnvironmentVariable "CI_ICU_PATH_Mingw49" "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1"
 
-}
+} else {
 
-Write-Output "ICU = $version" >> ~\versions.txt
+   $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z"
+   $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z"
+   $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800"
+
+   $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z"
+
+   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) {
+      Write-Host "Fetching from URL ..."
+      Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32
+      Verify-Checksum $icuPackage_msvc2013_32 $sha1_2013_32
+      Get-ChildItem $icuPackage_msvc2013_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_32_devel\""}
+
+      Write-Host "Cleaning $icuPackage_msvc2013_32..."
+      Remove-Item -Recurse -Force $icuPackage_msvc2013_32
+
+      Write-Output "ICU MSVC2013 = $version" >> ~\versions.txt
+   }
+
+# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine")
+
+}

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

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -29,20 +29,18 @@
 ##
 ## $QT_END_LICENSE$
 ##
-#############################################################################
-
+############################################################################
 . "$PSScriptRoot\helpers.ps1"
 
-# This script will install Vulkan SDK
+# This script will install gnuwin32
 
-$version = "1.0.51.0"
-$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
-$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
+$prog = "gnuwin32"
+$zipPackage = "$prog.zip"
+$temp = "$env:tmp"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
+$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
+Download $externalUrl $internalUrl "$temp\$zipPackage"
+Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
+Extract-7Zip "$temp\$zipPackage" C:\Utils
 
-Copy-Item $url_cache $vulkanPackage
-Run-Executable $vulkanPackage "/S"
-
-Write-Host "Cleaning $vulkanPackage.."
-Remove-Item -Recurse -Force -Path "$vulkanPackage"
-
-Write-Output "Vulkan SDK = $version" >> ~\versions.txt
+Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt

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

@@ -62,17 +62,13 @@ try {
     $client.Headers.Add("Cookie", $cookie)
     $client.DownloadFile($official_url, $javaPackage)
 
-    Download $official_url $official_url $javaPackage
+    Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage
 }
 
 Verify-Checksum $javaPackage $sha1
 
 Run-Executable "$javaPackage" "/s SPONSORS=0"
-Write-Host "Cleaning $javaPackage.."
-Remove-Item -Recurse -Force -Path "$javaPackage"
-
-Write-Host "Remove Java update from startup"
-reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f
+Remove "$javaPackage"
 
 Set-EnvironmentVariable "JAVA_HOME" "$installdir"
 Add-Path "$installdir\bin"

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

@@ -57,7 +57,7 @@ function InstallMinGW
 
     Extract-7Zip $mingwPackage $TARGETDIR
 
-    Set-EnvironmentVariable "$envvar" ("$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2))
+    Set-EnvironmentVariable "$envvar" "$targetdir\mingw32"
 
     Write-Host "Cleaning $mingwPackage.."
     Remove-Item -Recurse -Force -Path "$mingwPackage"

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

@@ -1,4 +1,4 @@
-#############################################################################
+############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
@@ -30,21 +30,21 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+
 . "$PSScriptRoot\helpers.ps1"
 
-# Install Visual Studio 2013 update 5
+# This script will install QNX 6.6.0
 
-$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"
+$version = "6.6.0"
+$nondottedversion = $version -replace '[.]',''
+$targetFolder = "c:"
+$fileName = "qnx" + $nondottedversion + ".zip"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $fileName
+$zip = "C:\Windows\Temp\" + $fileName
 
-Write-Host "Fetching patch for Visual Studio $version..."
-Copy-Item $url_cache $package
+Download $url_cache $url_cache $zip
+Verify-Checksum $zip "52e451648eeef1f14a516fa03d8ddd1a59d485cd"
+Extract-7Zip $zip $targetFolder
 
-Write-Host "Installing Update 5 for Visual Studio $version..."
-Run-Executable "$package" "/norestart /passive"
-
-Write-Host "Removing $package ..."
-Remove-Item $package
-
-Write-Output "Visual Studio = $version" >> ~\versions.txt
+Set-EnvironmentVariable "QNX_660" "$targetFolder"
+Write-Output "QNX = $version" >> ~\versions.txt

coin/provisioning/common/windows/jom.ps1

@@ -1,11 +1,9 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = Get-DownloadLocation "jom_1_1_2.zip"
+$zip = "c:\users\qt\downloads\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-7Zip $zip C:\Utils\Jom
+Extract-Zip $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,94 +1,33 @@
-param(
-    [Int32]$archVer=32,
-    [string]$toolchain="vs2015",
-    [bool]$setDefault=$true
-)
+param([Int32]$archVer=32)
 . "$PSScriptRoot\helpers.ps1"
 
 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
 # The Clang library (C-bindings), version 3.9 or higher is required for building.
 
-# Starting from Qt 5.11 QDoc requires Clang to parse C++
-
 Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
     $var = $_.Split('=')
-    New-Variable -Name $var[0] -Value $var[1] -Force
+    New-Variable -Name $var[0] -Value $var[1]
     $libclang_version = $libclang_version -replace '["."]'
 }
 
-$zip = Get-DownloadLocation "libclang.7z"
-$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"
+if ( $archVer -eq 64 ) {
+    $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
+    $url = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-vs2015_64.7z"
+} else {
+    $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
+    $url = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-vs2015_32.7z"
 }
 
-$toolchainSuffix = ""
+$zip = "c:\users\qt\downloads\libclang.7z"
+$destination = "C:\Utils\libclang-" + $libclang_version
 
-if ( $toolchain -eq "vs2015" ) {
-    if ( $archVer -eq 64 ) {
-        $sha1 = "37afa18d243a50c05bee5c6e16b409ed526ec17a"
-        $destination = $baseDestination + "-64"
+Download $url $url $zip
+Verify-Checksum $zip $sha1
 
-        setURL
-        Download $url $url $zip
-        Verify-Checksum $zip $sha1
+Extract-7Zip $zip C:\Utils\
+Rename-Item C:\Utils\libclang $destination
+Remove-Item -Force -Path $zip
 
-        Extract-7Zip $zip C:\Utils\
-        Rename-Item C:\Utils\libclang $destination
-        Remove-Item -Force -Path $zip
-    }
+Set-EnvironmentVariable "LLVM_INSTALL_DIR" $destination
 
-    $archVer=32
-    $sha1 = "812b6089c6da99ced9ebebbd42923bd96590519d"
-    $destination = $baseDestination + "-32"
-
-    setURL
-    Download $url $url $zip
-    Verify-Checksum $zip $sha1
-
-    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 = "1233e6c008b90d89483df0291a597a0bac426d29"
-        $destination = $baseDestination + "-64"
-
-        setURL
-        Download $url $url $zip
-        Verify-Checksum $zip $sha1
-
-        Extract-7Zip $zip C:\Utils\
-        Rename-Item C:\Utils\libclang $destination
-        Remove-Item -Force -Path $zip
-    }
-
-    $archVer=32
-    $sha1 = "2d6ceab0e1a05e2b19fe615c57b64d36977b4933"
-    $destination = $baseDestination + "-32"
-
-    setURL
-    Download $url $url $zip
-    Verify-Checksum $zip $sha1
-
-    Extract-7Zip $zip C:\Utils\
-    Rename-Item C:\Utils\libclang $destination
-    Remove-Item -Force -Path $zip
-    $toolchainSuffix = "mingw"
-}
-
-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 = Get-DownloadLocation "libusb-1.0.21-ife3db79196-msvc2015.7z"
+$archive = "C:\users\qt\downloads\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,5 +45,3 @@ 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,4 +62,3 @@ if (Is64BitWinHost) {
     Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32"
 }
 
-Write-Output "Mesa llvmpipe = $version" >> ~/versions.txt

coin/provisioning/common/windows/msvc_2015_update3_patch.ps1

@@ -63,5 +63,3 @@ 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,11 +37,8 @@
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
 $version = "5.6.11"
-$baseNameX64 = "mysql-$version-winx64"
-$packagex64 = "C:\Windows\temp\$baseNameX64.zip"
-$baseNameX86 = "mysql-$version-win32"
-$packagex86 = "C:\Windows\temp\$baseNameX86.zip"
-$installFolder = "C:\Utils\my_sql"
+$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip"
+$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"
 
 function DownloadAndInstall
 {
@@ -55,7 +52,7 @@ function DownloadAndInstall
     Copy-Item $internalUrl $package
 
     $zipDir = [io.path]::GetFileNameWithoutExtension($package)
-    Extract-7Zip $package $installPath "$zipDir\lib $zipDir\bin $zipDir\share $zipDir\include"
+    Extract-Dev-Folders-From-Zip $package $zipDir $installPath
 
     Remove-Item -Path $package
 }
@@ -63,21 +60,28 @@ 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\$baseNameX64\include"
-    Set-EnvironmentVariable "MYSQL_LIB_x64" "$installFolder\$baseNameX64\lib"
+    Set-EnvironmentVariable "MYSQL_INCLUDE_x64" "$installFolder\include"
+    Set-EnvironmentVariable "MYSQL_LIB_x64" "$installFolder\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\$baseNameX86\include"
-Set-EnvironmentVariable "MYSQL_LIB_x86" "$installFolder\$baseNameX86\lib"
+Set-EnvironmentVariable "MYSQL_INCLUDE_x86" "$installFolder\include"
+Set-EnvironmentVariable "MYSQL_LIB_x86" "$installFolder\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,13 +1,11 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = Get-DownloadLocation "ninja-1.6.0-win-x86.zip"
+$zip = "c:\users\qt\downloads\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-7Zip $zip C:\Utils\Ninja
+Extract-Zip $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_2o"
+$version = "1_0_2t"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 
@@ -47,8 +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 = "86c71a28eda53fa406b957dd37491d616344b464"
-
+    $sha1 = "92288fb8f5d1af36960da518a21ed76cd9d7bd55"
     Write-Host "Fetching from URL ..."
     Download $externalUrl $internalUrl $packagex64
     Verify-Checksum $packagex64 $sha1
@@ -74,7 +73,7 @@ if (Is64BitWinHost) {
 
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "bfc14fc03bd1d4dd03bf5459f62969d6b0ee96fe"
+$sha1 = "db9bb96d33f2393e2a9912a28e2921e6bc879203"
 
 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86

coin/provisioning/common/windows/patch_qnx.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2016 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -31,19 +31,21 @@
 ##
 #############################################################################
 
+# Patch QNX SDK due to issues in the standard library.
+# The patches are available here:
+# http://www.qnx.com/download/feature.html?programid=27555
+# A copy of the patch must be in the root of the Coin path in
+# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
+
+
 . "$PSScriptRoot\helpers.ps1"
 
-Write-Host "MQTT: Downloading Paho test broker..."
-$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"
+$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip"
+$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565"
+$tempDir = "C:\temp\qnx_path"
 
-Download $externalUrl $internalUrl $zip
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
 Verify-Checksum $zip $sha1
-
-Write-Host "MQTT: Installing $zip..."
-Extract-7Zip $zip C:\Utils
-Remove-Item -Path $zip
-
-Set-EnvironmentVariable "MQTT_TEST_BROKER_LOCATION" "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py"
+Extract-Zip $zip $tempDir
+Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force
+Remove-Item $tempDir -recurse

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"
+    $installFolder = "C:\Utils\postgresql\pgsql"
     $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-7Zip $packagex64 $installFolder "pgsql\lib pgsql\bin pgsql\share pgsql\include"
+    Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
 
     Write-Host "Remove downloaded $packagex64 ..."
     Remove-Item -Path $packagex64
 
-    Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\pgsql\include"
-    Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\pgsql\lib"
+    Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\include"
+    Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\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"
+    $installFolder = "C:\Utils\postgresql$architecture\pgsql"
 } else {
-    $installFolder = "C:\Utils\postgresql"
+    $installFolder = "C:\Utils\postgresql\pgsql"
 }
 
 
@@ -77,13 +77,13 @@ Write-Host "Fetching from URL..."
 Download $externalUrl $internalUrl $packagex86
 Verify-Checksum $packagex86 $sha1
 Write-Host "Installing $packagex86 ..."
-Extract-7Zip $packagex86 $installFolder "pgsql\lib pgsql\bin pgsql\share pgsql\include"
+Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder
 
 Write-Host "Remove downloaded $packagex86 ..."
 Remove-Item -Path $packagex86
 
-Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\pgsql\include"
-Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\pgsql\lib"
+Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\include"
+Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\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,17 +30,13 @@
 ## $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 ( $archVer -eq 64 ) {
+if (Is64BitWinHost) {
     $arch = ".amd64"
     $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
 } else {
@@ -55,32 +51,21 @@ 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"
+Run-Executable "msiexec" "/passive /i $package 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 $targetDir\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content $targetDir\lib\zipfile.py
+(Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py
 Write-Host "Remove $package..."
 Remove-Item -Path $package
 
-# 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"
-}
+Add-Path "C:\Python27;C:\Python27\Scripts"
 
-
-Run-Executable "$targetDir\python.exe" "-m ensurepip"
+Run-Executable "C:\Python27\python.exe" "-m ensurepip"
 
 # Install python virtual env
-if (IsProxyEnabled) {
-    $proxy = Get-Proxy
-    Write-Host "Using proxy ($proxy) with pip"
-    $pip_args = "--proxy=$proxy"
-}
-Run-Executable "$targetDir\Scripts\pip.exe" "$pip_args install virtualenv"
-
-Write-Output "Python-$archVer = $version" >> ~/versions.txt
+#if ( isProxyEnabled ) {
+#    Write-Host "Using proxy with pip"
+#    $pip_args = "--proxy=" + (getProxy)
+#}
+Run-Executable "C:\Python27\Scripts\pip.exe" "install virtualenv"

coin/provisioning/common/windows/python3.ps1

@@ -32,20 +32,18 @@
 ##
 #############################################################################
 
+. "$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 ( $archVer -eq 64 ) {
-    Write-Host "Installing 64 bit Python"
+if (Is64BitWinHost) {
+    Write-Host "Running in 64 bit system"
     $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"
@@ -63,23 +61,12 @@ Run-Executable "$package" "/q TargetDir=$install_path"
 Write-Host "Remove $package..."
 Remove-Item -Path $package
 
-# For cross-compilation we export some helper env variable
-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"
-}
-
+Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
+Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
 
 # Install python virtual env
-if (IsProxyEnabled) {
-    $proxy = Get-Proxy
-    Write-Host "Using proxy ($proxy) with pip"
-    $pip_args = "--proxy=$proxy"
-}
-Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv"
-
-Write-Output "Python3-$archVer = $version" >> ~/versions.txt
-
+#if ( isProxyEnabled ) {
+#    Write-Host "Using proxy with pip"
+#    $pip_args = "--proxy=" + (getProxy)
+#}
+Run-Executable "$install_path\Scripts\pip3.exe" "install virtualenv"

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

@@ -35,10 +35,11 @@ $n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt"
 $n = $n.Split('=')
 New-Variable -Name $n[0] -Value $n[1]
 
-if ([string]::IsNullOrEmpty($proxy)) {
+if (([string]::IsNullOrEmpty($proxy)) -or ($proxy -eq '""')) {
     Write-Host "No proxy is defined."
 } else {
     Write-Host "Checking proxy @ $proxy"
+
     $proxy = $proxy -replace '"', ""
     $webclient = New-Object System.Net.WebClient
     $proxy_obj = New-Object System.Net.WebProxy($proxy)
@@ -52,8 +53,10 @@ if ([string]::IsNullOrEmpty($proxy)) {
     }
     if ($iserror -eq $true) {
         Write-Host "Testing download with proxy does not work: $ErrorMessage, $FailedItem. Not setting proxy."
-    } else {
+    }
+    else {
         Write-Host "Setting proxy to: $proxy"
+
         Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer -Value "$proxy"
         Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyEnable -Value 1
         Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride -Value 10.215

coin/provisioning/common/windows/squishInstall.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## 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.
@@ -38,7 +38,7 @@
 # NOTE! Make sure 64bit versions are always installed before 32bit,
 # because they use same folder name before a rename
 
-$version = "6.3.0"
+$version = "6.5.1"
 
 # Qt branch without dot (*.*)
 $qtBranch = "59x"
@@ -48,8 +48,6 @@ $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"
@@ -79,13 +77,9 @@ 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
         }
     }
 }
@@ -99,27 +93,10 @@ 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,8 +32,6 @@
 #############################################################################
 
 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/vc_redist.ps1

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

coin/provisioning/common/windows/win10-enable-devmode.ps1

@@ -2,13 +2,4 @@
 #
 # In order to run auto tests for UWP, we have to enable developer mode on Windows 10 machines.
 # https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development
-
-. "$PSScriptRoot\helpers.ps1"
-
-if (Is64BitWinHost) {
-    $bitness = "/reg:64"
-} else {
-    $bitness = "/reg:32"
-}
-
-Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock`" /V  AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F $bitness"
+REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /V AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F

coin/provisioning/common/windows/winrtrunner.ps1

@@ -1,12 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-$zip = Get-DownloadLocation "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_cache $zip
-Verify-Checksum $zip "b83f2166b5799910a661d1db02771edf94880785"
-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,10 +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
+
+sudo yum update -y nss curl

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

@@ -1,4 +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-RHEL-6.6-x86_64/03-install-rhel-epel.sh

@@ -1,49 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-# shellcheck source=../common/unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-
-package="epel-release-6-8.noarch.rpm"
-primaryUrl="https://dl.fedoraproject.org/pub/epel/6/x86_64/Packages/e/$package"
-cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel6/$package"
-sha1="2b2767a5ae0de30b9c7b840f2e34f5dd9deaf19a"
-targetFile="/tmp/$package"
-
-DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
-
-sudo rpm -ivh "$targetFile"
-rm "$targetFile"
-

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

@@ -1,43 +1,11 @@
 #!/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")
-# With RHEL 6.6 we are using different lib clang than others
-VERSION=4.0
-URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
+. $BASEDIR/../common/shared/sw_versions.txt
+VERSION=$libclang_version
+URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/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/08-pythondev.sh

@@ -7,6 +7,11 @@ set -ex
 
 sudo yum install -y python-devel python-virtualenv
 
+# install the EPEL repository which provides python3
+wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
+sudo rpm -Uvh epel-release-latest-6.noarch.rpm
+sudo rm -f epel-release-latest-6.noarch.rpm
+
 # install python3
 sudo yum install -y python34-devel
 

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

@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-# 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,28 +45,27 @@ function Install7ZPackageFromURL {
     expectedSha1=$2
     targetDirectory=$3
 
-    targetFile=$(mktemp)
-    wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
+    targetFile=`mktemp`
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
     echo "$expectedSha1  $targetFile" | sha1sum --check
-    sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile"
-    rm "$targetFile"
+    sudo /usr/local/bin/7z x -yo$targetDirectory $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)
-# shellcheck disable=SC2064
+tempDir=`mktemp -d`
 trap "sudo rm -fr $tempDir" EXIT
-Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir"
-sudo cp -a "$tempDir/lib"/* /usr/lib64
-sudo cp -a "$tempDir"/* /usr/
+Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
+sudo cp -a $tempDir/lib/* /usr/lib64
+sudo cp -a $tempDir/* /usr/
 
 sudo /sbin/ldconfig
 

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh

@@ -33,19 +33,32 @@
 ##
 #############################################################################
 
-sudo apt-get update
-sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev
+# Patch QNX SDK due to issues in the standard library.
+# The patches are available here:
+# http://www.qnx.com/download/feature.html?programid=27555
+# A copy of the patch must be in the root of the Coin path in
+# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
 
-TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
-trap "sudo rm -fr $TEMPDIR" EXIT
-cd $TEMPDIR
-git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua
-cd freeopcua
-git checkout 955cc5b924cf310fc15b376a11f4b7b9db28980b
-mkdir build
-cd build
-source ~/.profile
-cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..
-make
-sudo make install
-sudo /sbin/ldconfig
+set -ex
+sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565"
+
+function InstallZipPackageFromURL {
+    url=$1
+    expectedSha1=$2
+    targetDirectory=$3
+
+    targetFile=`mktemp`
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
+    echo "$expectedSha1  $targetFile" | sha1sum --check
+
+    tempDir=`mktemp -d`
+    /usr/bin/unzip -o -d $tempDir $targetFile
+    trap "sudo rm -fr $targetFile $tempDir" EXIT
+
+    sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/
+}
+
+echo "Patching QNX"
+
+baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip"
+InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/"

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

@@ -39,10 +39,9 @@
 
 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,8 +36,7 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-# shellcheck source=../common/shared/network_test_server_ip.txt
-source "$BASEDIR/../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,7 +35,6 @@
 
 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

@@ -84,17 +84,6 @@ installPackages+=(perl-Digest-SHA)
 installPackages+=(glibc.i686)
 # Enable Qt Bluetooth
 installPackages+=(bluez-libs-devel)
-# QtWebKit
-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[@]}"
 

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

@@ -2,10 +2,9 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-# shellcheck source=../common/shared/sw_versions.txt
-. "$BASEDIR/../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="71194c4d6065a62ac1a891123df79fd9da311bf0"
+URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
+SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
 
-"$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,5 +39,4 @@ 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,5 +35,4 @@
 
 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,5 +35,4 @@
 
 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,5 +35,4 @@
 
 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,10 +34,8 @@
 #############################################################################
 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

@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-# 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)
-wget --tries=5 --waitretry=5 --output-document="$targetFile" "$baseBinaryPackageURL"
+targetFile=`mktemp`
+wget --tries=5 --waitretry=5 --output-document=$targetFile $baseBinaryPackageURL
 echo "$sha1  $targetFile" | sha1sum --check
-sudo 7z x -y -o/usr/lib64 "$targetFile"
-sudo rm "$targetFile"
+sudo 7z x -y -o"/usr/lib64" $targetFile
+sudo rm $targetFile
 
 echo "Installing custom ICU devel packages on RHEL"
 
-tempDir=$(mktemp -d)
+tempDir=`mktemp -d`
 
-targetFile=$(mktemp)
-wget --tries=5 --waitretry=5 --output-document="$targetFile" "$develPackageURL"
+targetFile=`mktemp`
+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"/* /usr/
+sudo cp -a $tempDir/lib/* /usr/lib64
+sudo cp -a $tempDir/* /usr/
 
-sudo rm "$targetFile"
-sudo rm -fr "$tempDir"
+sudo rm $targetFile
+sudo rm -fr $tempDir
 
 sudo /sbin/ldconfig
 

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

@@ -35,5 +35,4 @@
 
 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

@@ -1,37 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-# 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

@@ -1,48 +0,0 @@
-#!/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.
-
-# Storage installed RPM packages information
-
-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"

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

@@ -1,55 +0,0 @@
-#!/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_64/01-systemsetup.sh

@@ -59,6 +59,3 @@ 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

@@ -157,6 +157,8 @@ installPackages+=(libbluetooth-dev)
 #VirtualBox for RTA
 installPackages+=(virtualbox)
 installPackages+=(dkms)
+#Pypdf for QSR documentation
+installPackages+=(python-pypdf2)
 
 echo "Running update for apt"
 sudo apt-get update

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

@@ -1,43 +0,0 @@
-#!/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/03-qemu.sh

@@ -94,10 +94,4 @@ sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i
 sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i
 
 # Set QEMU font configuration variables
-qemu_env="FONTCONFIG_FILE=$QEMU_FONTCONFFILE"
-qemu_env="${qemu_env},FONTCONFIG_PATH=$QEMU_FONTCONFPATH"
-
-# Disable QtWayland window decorations, as they cause flakiness when used inside qemu (QTBUG-66173)
-qemu_env="${qemu_env},QT_WAYLAND_DISABLE_WINDOWDECORATION=1"
-
-SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\""
+SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\""

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

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-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="71194c4d6065a62ac1a891123df79fd9da311bf0"
-
-$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

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

@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
 echo "Installing Yocto toolchain for 32-bit b2qt..."
 
-versionARM="2.3.1"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-41b0b46.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
-SHA1="f17cce550c9d2148f11ae5c760f43a67e9813a45"
+versionARM="2.2.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-2c947f7.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package"
+SHA1="2583ae29951954cb27f12400fcb4ee94738d1430"
 yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
 yoctoLocationARMv7="/opt/yocto-armv7"
 sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi"
@@ -60,11 +60,11 @@ rm -rf "$yoctoInstaller"
 
 echo "Installing Yocto toolchain for 64-bit b2qt..."
 
-versionARM64="2.3.1"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-41b0b46.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
-SHA1="b49d7ec8a6339dda5a82815dc31fed1fae00851d"
+versionARM64="2.2.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-2c947f7.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package"
+SHA1="512b5bc1ad62af88d021eb511eeac4648d661fc6"
 yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
 yoctoLocationARM64="/opt/yocto-arm64"
 sysrootARM64="sysroots/aarch64-poky-linux"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh

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

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

@@ -1,46 +0,0 @@
-#!/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

@@ -1,55 +0,0 @@
-#!/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,9 +3,7 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-# 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 $BASEDIR/../common/shared/network_test_server_ip.txt
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
@@ -16,10 +14,7 @@ echo "Set DISPLAY"
 echo 'export DISPLAY=":0"' >> ~/.bashrc
 echo "Disabling file indexing."
 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,3 +1,2 @@
 #!/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

@@ -3,12 +3,9 @@
 set -ex
 
 sudo zypper -nq install git
-sudo zypper -nq install gcc7
-sudo zypper -nq install gcc7-c++
-sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \
-                                     --slave /usr/bin/g++ g++ /usr/bin/g++-7 \
-                                     --slave /usr/bin/cc cc /usr/bin/gcc-7 \
-                                     --slave /usr/bin/c++ c++ /usr/bin/g++-7
+# default compiler, gcc 4.8.5
+sudo zypper -nq install gcc
+sudo zypper -nq install gcc-c++
 
 sudo zypper -nq install bison
 sudo zypper -nq install flex
@@ -20,7 +17,6 @@ sudo zypper -nq install glib2-devel
 sudo zypper -nq install libopenssl-devel
 sudo zypper -nq install freetype2-devel
 sudo zypper -nq install fontconfig-devel
-sudo zypper -nq install sqlite3-devel
 
 # EGL support
 sudo zypper -nq install Mesa-libEGL-devel
@@ -52,16 +48,5 @@ sudo zypper -nq install libXtst-devel
 sudo zypper -nq install mozilla-nspr-devel
 sudo zypper -nq install mozilla-nss-devel
 
-# qtwebkit
-sudo zypper -nq install libxml2-devel
-sudo zypper -nq install libxslt-devel
-
-# GStreamer (qtwebkit and qtmultimedia)
-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