From 140c6479b5916e21d6c03a94f844a0f8693af0f8 Mon Sep 17 00:00:00 2001
From: Kari Oikarinen <kari.oikarinen@qt.io>
Date: Tue, 27 Feb 2018 11:58:04 +0200
Subject: [PATCH 01/18] Install libusbx-devel for QDB on RHEL 7.4

On previous RHEL version the package was libusb1-devel. That package doesn't
seem to be there anymore, which presumably means why the package to install was
changed to libusb-devel. Unfortunately libusb-devel provides a compatibility
package for the old 0.1 API version and doesn't work with QDB. libusbx-devel
seems to be the new name for the 1.0 API version of libusb on RHEL.

Change-Id: I50a10bed0b73b536e5d591363f01d7cf6a3a69d7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
index 84e42f7b..7c595e3a 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
@@ -61,7 +61,7 @@ installPackages+=(gstreamer1-plugins-base-devel)
 # gtk3 style for QtGui/QStyle
 installPackages+=(gtk3-devel)
 # libusb1 for tqtc-boot2qt/qdb
-installPackages+=(libusb-devel)
+installPackages+=(libusbx-devel)
 # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
 installPackages+=(speech-dispatcher-devel)
 # Python

From 52b163092ad890620c1a190f5fce404565e19e99 Mon Sep 17 00:00:00 2001
From: Jani Heikkinen <jani.heikkinen@qt.io>
Date: Thu, 25 Jan 2018 10:21:35 +0200
Subject: [PATCH 02/18] Add missing 08-libclang.ps1 for windows7 provisioning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We need to set LLVM_INSTALL_DIR to be able to build qdoc. That was
missing from windows7.

Task-number: QTBUG-65950
Change-Id: I7f75eb0181056a2117080ead6dc5862324906689
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 coin/provisioning/common/windows/libclang.ps1 | 64 +++++++++++++++----
 .../qtci-windows-10-x86/08-libclang.ps1       |  2 +-
 .../qtci-windows-10-x86_64/08-libclang.ps1    |  2 +-
 .../qtci-windows-7-x86/08-libclang.ps1        |  1 +
 4 files changed, 54 insertions(+), 15 deletions(-)
 create mode 100644 coin/provisioning/qtci-windows-7-x86/08-libclang.ps1

diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1
index 84d3656f..a8095ffe 100644
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -1,4 +1,7 @@
-param([Int32]$archVer=32)
+param(
+    [Int32]$archVer=32,
+    [string]$toolchain="vs2015"
+)
 . "$PSScriptRoot\helpers.ps1"
 
 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@@ -14,11 +17,30 @@ Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
 
 $zip = "c:\users\qt\downloads\libclang.7z"
 $baseDestination = "C:\Utils\libclang-" + $libclang_version
-if ( $archVer -eq 64 ) {
-    $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
-    $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z"
-    $destination = $baseDestination + "-64"
 
+function setURL() {
+    $script:url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
+}
+
+if ( $toolchain -eq "vs2015" ) {
+    if ( $archVer -eq 64 ) {
+        $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
+        $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 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
+    $destination = $baseDestination + "-32"
+
+    setURL
     Download $url $url $zip
     Verify-Checksum $zip $sha1
 
@@ -27,16 +49,32 @@ if ( $archVer -eq 64 ) {
     Remove-Item -Force -Path $zip
 }
 
-$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
-$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z"
-$destination = $baseDestination + "-32"
+if ( $toolchain -eq "mingw" ) {
+    if ( $archVer -eq 64 ) {
+        $sha1 = "3e318f70a1e76c14365ced65f4fa7031bb730818"
+        $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
+    }
+
+    $archVer=32
+    $sha1 = "a9973192a01a9c16976ed0cc6ef6dac3dbc4a2d3"
+    $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
+}
 
 Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
 Write-Output "libClang = $libclang_version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
index 3ad5b9fd..8da8cc5a 100644
--- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\windows\libclang.ps1" 32
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2015
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
index b6e3582c..f7a722d7 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\windows\libclang.ps1" 64
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2015
diff --git a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1
new file mode 100644
index 00000000..375deed3
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw

From e926cd75565d07ee369d478a7a90e2e7d9f0fd06 Mon Sep 17 00:00:00 2001
From: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Date: Fri, 2 Mar 2018 14:34:07 +0100
Subject: [PATCH 03/18] Update submodules on '5.11' in qt5

Change-Id: I0b551c2af57243eee865cd4319ee1797dc38f705
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 qt3d             | 2 +-
 qtbase           | 2 +-
 qtcharts         | 2 +-
 qtconnectivity   | 2 +-
 qtdeclarative    | 2 +-
 qtdoc            | 2 +-
 qtlocation       | 2 +-
 qtmultimedia     | 2 +-
 qtnetworkauth    | 2 +-
 qtqa             | 2 +-
 qtquickcontrols2 | 2 +-
 qtrepotools      | 2 +-
 qtserialbus      | 2 +-
 qtsvg            | 2 +-
 qttools          | 2 +-
 qtwayland        | 2 +-
 qtwebengine      | 2 +-
 qtx11extras      | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/qt3d b/qt3d
index 4ce90380..7ddb976a 160000
--- a/qt3d
+++ b/qt3d
@@ -1 +1 @@
-Subproject commit 4ce90380ad5272de3bec178c480a132b5d4771ba
+Subproject commit 7ddb976ab22c5b75d3180e19ed4e27ff322a99af
diff --git a/qtbase b/qtbase
index 1f6bd8bf..78e92997 160000
--- a/qtbase
+++ b/qtbase
@@ -1 +1 @@
-Subproject commit 1f6bd8bfb2206480ca5b5c267da38659e6cff20e
+Subproject commit 78e92997ed35ddc8bb6f7f6c0a4fffba026d5d8f
diff --git a/qtcharts b/qtcharts
index 1f78a69f..27d2c703 160000
--- a/qtcharts
+++ b/qtcharts
@@ -1 +1 @@
-Subproject commit 1f78a69f4f6c33393a0b43a9151c698aa3d05bbb
+Subproject commit 27d2c7035b1812dc2bdf7f0e580a42c613199fd8
diff --git a/qtconnectivity b/qtconnectivity
index d70fe2ac..cfdfce61 160000
--- a/qtconnectivity
+++ b/qtconnectivity
@@ -1 +1 @@
-Subproject commit d70fe2ac47dbf034991f0b2a4b0a3e1f16d171b9
+Subproject commit cfdfce6139c27e1c9f2e9dace2534b4f052cc0ba
diff --git a/qtdeclarative b/qtdeclarative
index e41d0672..440a15c5 160000
--- a/qtdeclarative
+++ b/qtdeclarative
@@ -1 +1 @@
-Subproject commit e41d067227eb6225b05df88ab724708588fa5304
+Subproject commit 440a15c52d979cc0221217480720978d55935c0d
diff --git a/qtdoc b/qtdoc
index 2487a508..ed8d69e9 160000
--- a/qtdoc
+++ b/qtdoc
@@ -1 +1 @@
-Subproject commit 2487a5086711aa7154d049bb197e95847b5bfd63
+Subproject commit ed8d69e95eb31eadfff0c7ba628732b0d0325efc
diff --git a/qtlocation b/qtlocation
index d458bd47..8666201d 160000
--- a/qtlocation
+++ b/qtlocation
@@ -1 +1 @@
-Subproject commit d458bd47106dd849e6cf72b97a27f871735e4eed
+Subproject commit 8666201dcc76b277a2d5a77b84ed7e7114b76987
diff --git a/qtmultimedia b/qtmultimedia
index 0354fdda..306e8511 160000
--- a/qtmultimedia
+++ b/qtmultimedia
@@ -1 +1 @@
-Subproject commit 0354fdda8b430f7749082ca55ad6c1dc781f3918
+Subproject commit 306e8511602ac3c23778d6aef994269d17d3145c
diff --git a/qtnetworkauth b/qtnetworkauth
index e8552dda..88694209 160000
--- a/qtnetworkauth
+++ b/qtnetworkauth
@@ -1 +1 @@
-Subproject commit e8552ddaf17dad91df3a03ccfc0d708ab13d6d0e
+Subproject commit 886942094513d4b32c7ff7358ee5dd23e8e0d83a
diff --git a/qtqa b/qtqa
index 0d050f36..e3754bc5 160000
--- a/qtqa
+++ b/qtqa
@@ -1 +1 @@
-Subproject commit 0d050f36dc74adc3a7e29b1d51ccf55027d9c522
+Subproject commit e3754bc547c44aac2713d6245543ee3df484af8f
diff --git a/qtquickcontrols2 b/qtquickcontrols2
index 3de42498..b4db69ee 160000
--- a/qtquickcontrols2
+++ b/qtquickcontrols2
@@ -1 +1 @@
-Subproject commit 3de42498fce9bacbdda71e4c8a9af494434e2993
+Subproject commit b4db69eee6dc2f381b24aa24586171dbaf8d116e
diff --git a/qtrepotools b/qtrepotools
index c112252b..dfb5e109 160000
--- a/qtrepotools
+++ b/qtrepotools
@@ -1 +1 @@
-Subproject commit c112252bc2e0e35dbdc946171673fbc867a52996
+Subproject commit dfb5e10927531c56d69115df1a1a8ebb494065ec
diff --git a/qtserialbus b/qtserialbus
index 7c6e9d8f..860c7988 160000
--- a/qtserialbus
+++ b/qtserialbus
@@ -1 +1 @@
-Subproject commit 7c6e9d8f29148793dc619a743a0b5d3a601ec34b
+Subproject commit 860c798835ae8846e4100ea6557bed28317713bb
diff --git a/qtsvg b/qtsvg
index f4554e29..1787f95f 160000
--- a/qtsvg
+++ b/qtsvg
@@ -1 +1 @@
-Subproject commit f4554e29a44af2cdd9e518f5931e28cf349883c6
+Subproject commit 1787f95f5727a20a4f0871736ad987fcfdf0f3c6
diff --git a/qttools b/qttools
index 9dfdfdf5..ba6d244f 160000
--- a/qttools
+++ b/qttools
@@ -1 +1 @@
-Subproject commit 9dfdfdf5744d3bf0ffea3c380ed37f0ab9273fe5
+Subproject commit ba6d244fa0a79f24c1b0256de5fec02aaba797bb
diff --git a/qtwayland b/qtwayland
index 72999738..2c01e52f 160000
--- a/qtwayland
+++ b/qtwayland
@@ -1 +1 @@
-Subproject commit 72999738489b5251d025c954a77c93e8e1fdfd9d
+Subproject commit 2c01e52f098c5a1cd7bb653b3e49fd2e02f11a60
diff --git a/qtwebengine b/qtwebengine
index b0af137a..0ae642de 160000
--- a/qtwebengine
+++ b/qtwebengine
@@ -1 +1 @@
-Subproject commit b0af137a8c58af2538e500808ae1da6133a7d284
+Subproject commit 0ae642de5723d4bcbb3409d57ea8c17d87e798fb
diff --git a/qtx11extras b/qtx11extras
index 78a10dad..d80236f5 160000
--- a/qtx11extras
+++ b/qtx11extras
@@ -1 +1 @@
-Subproject commit 78a10dad08d1c354f7afb539bd89f0d75a9fe3b1
+Subproject commit d80236f50559f4fe785fba598a03aaa7f05d37ac

From b038a8c2bd5ef9c53653eb0b2a072f1cb4308f30 Mon Sep 17 00:00:00 2001
From: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Date: Sat, 3 Mar 2018 03:03:20 +0200
Subject: [PATCH 04/18] Update submodules on '5.11' in qt5

Change-Id: I2ba427ea1d9e37421775c297d983654f3e691845
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
---
 qtdeclarative | 2 +-
 qtwebengine   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qtdeclarative b/qtdeclarative
index 440a15c5..6b310e5f 160000
--- a/qtdeclarative
+++ b/qtdeclarative
@@ -1 +1 @@
-Subproject commit 440a15c52d979cc0221217480720978d55935c0d
+Subproject commit 6b310e5f9a53c366fbb8fb78bd7c343aad4e0cdd
diff --git a/qtwebengine b/qtwebengine
index 0ae642de..5cdc7d41 160000
--- a/qtwebengine
+++ b/qtwebengine
@@ -1 +1 @@
-Subproject commit 0ae642de5723d4bcbb3409d57ea8c17d87e798fb
+Subproject commit 5cdc7d41f06393593fc7b8032755f8a654482648

From 686e3ff1b5fa6e81620e0538ee29ea3d4d5e5652 Mon Sep 17 00:00:00 2001
From: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Date: Sun, 4 Mar 2018 03:01:35 +0200
Subject: [PATCH 05/18] Update submodules on '5.11' in qt5

Change-Id: Iebf77d7f467d0fde9ee622e4e7b657cb1e9b8003
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
---
 qtbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qtbase b/qtbase
index 78e92997..1f920b77 160000
--- a/qtbase
+++ b/qtbase
@@ -1 +1 @@
-Subproject commit 78e92997ed35ddc8bb6f7f6c0a4fffba026d5d8f
+Subproject commit 1f920b779eb308ecdfd24423941b229cd0123589

From 764294fcb874223625bb79c91acb816ffb6ad2b2 Mon Sep 17 00:00:00 2001
From: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Date: Mon, 5 Mar 2018 03:01:31 +0200
Subject: [PATCH 06/18] Update submodules on '5.11' in qt5

Change-Id: I3f19c5b7daedfa7d499ab769404d1f34a32c7816
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
---
 qtbase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qtbase b/qtbase
index 1f920b77..174a1e96 160000
--- a/qtbase
+++ b/qtbase
@@ -1 +1 @@
-Subproject commit 1f920b779eb308ecdfd24423941b229cd0123589
+Subproject commit 174a1e96350e8b128e856e97392a9b57c8c08ebb

From bb9739773ccd2844bad5e8c0124405acb3315ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@qt.io>
Date: Thu, 22 Feb 2018 15:28:20 +0100
Subject: [PATCH 07/18] Simplify openssl_for_android_linux provisioning script

The script was over-engineered. The new version provides the same
functionality while removing uninteresting postmortem messages.

In addition try_catch.sh has a bug that injects set +e So it is good
to avoid using it.

Change-Id: I9e26e8fedad71d40270fe94695d5e1c09c3d9023
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 .../common/linux/openssl_for_android_linux.sh | 40 +++++--------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh
index e9f50b87..30022c39 100755
--- a/coin/provisioning/common/linux/openssl_for_android_linux.sh
+++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh
@@ -36,7 +36,6 @@
 # This script install OpenSSL from sources.
 # Requires GCC and Perl to be in PATH.
 
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
@@ -51,37 +50,16 @@ sha="36af23887402a5ea4ebef91df8e61654906f58f2"
 # QTQAINFRA-1436
 opensslHome="${installFolder}openssl-1.0.2"
 
-ExceptionDownload=99
-ExceptionTar=100
-ExceptionConfig=101
+DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 
-try
-(
-    (DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile") || throw $ExceptionDownload
+tar -xzf "$targetFile" -C "$installFolder"
+# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
+mv "${opensslHome}g" "${opensslHome}"
+pushd "$opensslHome"
 
-    tar -xzf "$targetFile" -C "$installFolder" || throw $ExceptionTar
-    # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
-    mv "${opensslHome}g" "${opensslHome}"
-    pushd "$opensslHome"
-    perl Configure shared android || throw $ExceptionConfig
+echo "Running configure"
+perl Configure shared android
 
-    SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
+SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
 
-    echo "OpenSSL for Android = $version" >> ~/versions.txt
-)
-catch || {
-    case $ex_code in
-        $ExceptionDownload)
-            exit 1;
-        ;;
-        $ExceptionTar)
-            echo "Failed to extract $targetFile"
-            exit 1;
-        ;;
-        $ExceptionConfig)
-            echo "Failed to run 'config'."
-            exit 1;
-        ;;
-    esac
-
-}
+echo "OpenSSL for Android = $version" >> ~/versions.txt

From 984b15d75804137276391dbf826c03a3734ba2a7 Mon Sep 17 00:00:00 2001
From: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Date: Wed, 7 Mar 2018 12:35:13 +0100
Subject: [PATCH 08/18] Update submodules on '5.11' in qt5

Change-Id: Id00474dec78862dbce0238560e859656bd69f69f
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 qt3d              | 2 +-
 qtbase            | 2 +-
 qtconnectivity    | 2 +-
 qtdoc             | 2 +-
 qtlocation        | 2 +-
 qtquickcontrols2  | 2 +-
 qtserialbus       | 2 +-
 qtserialport      | 2 +-
 qttools           | 2 +-
 qtvirtualkeyboard | 2 +-
 qtwayland         | 2 +-
 qtwebengine       | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/qt3d b/qt3d
index 7ddb976a..42a27f1a 160000
--- a/qt3d
+++ b/qt3d
@@ -1 +1 @@
-Subproject commit 7ddb976ab22c5b75d3180e19ed4e27ff322a99af
+Subproject commit 42a27f1a9ce319393a8e10a5f91b336e69fe2eb6
diff --git a/qtbase b/qtbase
index 174a1e96..3d53cf97 160000
--- a/qtbase
+++ b/qtbase
@@ -1 +1 @@
-Subproject commit 174a1e96350e8b128e856e97392a9b57c8c08ebb
+Subproject commit 3d53cf976dc41d136c0508ec05fa757fcf27f71b
diff --git a/qtconnectivity b/qtconnectivity
index cfdfce61..0a97e6cd 160000
--- a/qtconnectivity
+++ b/qtconnectivity
@@ -1 +1 @@
-Subproject commit cfdfce6139c27e1c9f2e9dace2534b4f052cc0ba
+Subproject commit 0a97e6cd908995699793b8513d3c7ef8020c2e32
diff --git a/qtdoc b/qtdoc
index ed8d69e9..e99e9a0f 160000
--- a/qtdoc
+++ b/qtdoc
@@ -1 +1 @@
-Subproject commit ed8d69e95eb31eadfff0c7ba628732b0d0325efc
+Subproject commit e99e9a0fa1dbaac63426404b1b04f4a9c67dbff7
diff --git a/qtlocation b/qtlocation
index 8666201d..a692e596 160000
--- a/qtlocation
+++ b/qtlocation
@@ -1 +1 @@
-Subproject commit 8666201dcc76b277a2d5a77b84ed7e7114b76987
+Subproject commit a692e59631bb1e8e0d4c0de8d2d6e68ca1c6cb60
diff --git a/qtquickcontrols2 b/qtquickcontrols2
index b4db69ee..923e7c26 160000
--- a/qtquickcontrols2
+++ b/qtquickcontrols2
@@ -1 +1 @@
-Subproject commit b4db69eee6dc2f381b24aa24586171dbaf8d116e
+Subproject commit 923e7c26fde2bc42d04902441691b7f7667460a7
diff --git a/qtserialbus b/qtserialbus
index 860c7988..21538dec 160000
--- a/qtserialbus
+++ b/qtserialbus
@@ -1 +1 @@
-Subproject commit 860c798835ae8846e4100ea6557bed28317713bb
+Subproject commit 21538dece0e38e0d4ab9bc6b4580687b40a411fa
diff --git a/qtserialport b/qtserialport
index aee027f5..ea1a95d3 160000
--- a/qtserialport
+++ b/qtserialport
@@ -1 +1 @@
-Subproject commit aee027f581839caf44de1b176099ef2b22d2fc84
+Subproject commit ea1a95d3567f1264126bf34218a5532ffb5afc51
diff --git a/qttools b/qttools
index ba6d244f..dc10d71b 160000
--- a/qttools
+++ b/qttools
@@ -1 +1 @@
-Subproject commit ba6d244fa0a79f24c1b0256de5fec02aaba797bb
+Subproject commit dc10d71b180a4ac55dcf62a03f627183ce611c31
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
index 9055bd56..c1bc3573 160000
--- a/qtvirtualkeyboard
+++ b/qtvirtualkeyboard
@@ -1 +1 @@
-Subproject commit 9055bd56653d2e488b52c66d884109fcccd23c2d
+Subproject commit c1bc35736503e5ceaee1991745eb5a43a013be40
diff --git a/qtwayland b/qtwayland
index 2c01e52f..e3bc3877 160000
--- a/qtwayland
+++ b/qtwayland
@@ -1 +1 @@
-Subproject commit 2c01e52f098c5a1cd7bb653b3e49fd2e02f11a60
+Subproject commit e3bc3877d667bc6b16e9790c35e2819ce421bd84
diff --git a/qtwebengine b/qtwebengine
index 5cdc7d41..49db723a 160000
--- a/qtwebengine
+++ b/qtwebengine
@@ -1 +1 @@
-Subproject commit 5cdc7d41f06393593fc7b8032755f8a654482648
+Subproject commit 49db723a10c4ab9144d7b84b4d6dd38bd6bab65a

From 7a052f4183a2a115fc1246daa20b53fbd9109c9b Mon Sep 17 00:00:00 2001
From: Maurice Kalinowski <maurice.kalinowski@qt.io>
Date: Tue, 6 Mar 2018 15:03:01 +0100
Subject: [PATCH 09/18] open62541: Fix provisioning for RHEL 7.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RHEL does not use pkgconfig, nor does it use /usr/local/lib as default
library path. As a consequence, the config tests for qtopcua were not
able to find the open62541 build.
c3591fe77debc0eab79851bd8f0c050cd4f3f608 in qtopcua.git allows to
specify an environment variable to point to the correct location. Move
to /usr/local/lib/open62541/ on all platforms consistently.

Change-Id: I73c8076b70767553edfd793889150c584d5c33b5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
---
 coin/provisioning/common/linux/open62541.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh
index 878bfe0d..4d907f17 100755
--- a/coin/provisioning/common/linux/open62541.sh
+++ b/coin/provisioning/common/linux/open62541.sh
@@ -44,6 +44,8 @@ fi
 
 set -ex
 
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
 TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
 trap "sudo rm -fr $TEMPDIR" EXIT
 cd $TEMPDIR
@@ -56,8 +58,12 @@ cd open62541
 git checkout ba3b55ab4afafe6bc9d2cb922eafd51c6cee4629
 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 ..
+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"
+

From 3230cdb138878df7dc6daa0f44e86c565629b2f2 Mon Sep 17 00:00:00 2001
From: Joni Jantti <joni.jantti@qt.io>
Date: Thu, 1 Mar 2018 09:48:25 +0200
Subject: [PATCH 10/18] Provisioning: win10_x86 - Disable automatic updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTQAINFRA-1814
Change-Id: I1fed4d952f77daa1c7bd5fdb34d9568ae1208bac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 .../qtci-windows-10-x86/04-disable-windows-updates.ps1           | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1

diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1
new file mode 100644
index 00000000..57428310
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"

From 95609c6657dd08cb96fadf55927f62788a56b82e Mon Sep 17 00:00:00 2001
From: Joni Jantti <joni.jantti@qt.io>
Date: Fri, 23 Feb 2018 14:22:07 +0200
Subject: [PATCH 11/18] Provisioning: Executequeueditems on Windows

mscorsvw.exe background processing is draining a lot of
CPU processing on Windows platforms. Executing the list
of to be processed items with full CPU capacity should
clear out the list and stop the background processing.

Task-number: QTQAINFRA-1775
Change-Id: Ib12bc10f4572390f20bfea915ca48ec398de46ee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
---
 .../common/windows/exceutequeueditems.ps1     | 39 +++++++++++++++++++
 .../90-exceutequeueditems.ps1                 |  1 +
 .../90-exceutequeueditems.ps1                 |  1 +
 .../90-exceutequeueditems.ps1                 |  1 +
 .../90-exceutequeueditems.ps1                 |  1 +
 .../90-exceutequeueditems.ps1                 |  1 +
 .../90-exceutequeueditems.ps1                 |  1 +
 7 files changed, 45 insertions(+)
 create mode 100644 coin/provisioning/common/windows/exceutequeueditems.ps1
 create mode 100644 coin/provisioning/qtci-windows-10-x86/90-exceutequeueditems.ps1
 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-exceutequeueditems.ps1
 create mode 100644 coin/provisioning/qtci-windows-7-x86/90-exceutequeueditems.ps1
 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/90-exceutequeueditems.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/90-exceutequeueditems.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/90-exceutequeueditems.ps1

diff --git a/coin/provisioning/common/windows/exceutequeueditems.ps1 b/coin/provisioning/common/windows/exceutequeueditems.ps1
new file mode 100644
index 00000000..3a4ff5c4
--- /dev/null
+++ b/coin/provisioning/common/windows/exceutequeueditems.ps1
@@ -0,0 +1,39 @@
+#############################################################################
+##
+## 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
+}
diff --git a/coin/provisioning/qtci-windows-10-x86/90-exceutequeueditems.ps1 b/coin/provisioning/qtci-windows-10-x86/90-exceutequeueditems.ps1
new file mode 100644
index 00000000..52306fb9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/90-exceutequeueditems.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\exceutequeueditems.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-exceutequeueditems.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-exceutequeueditems.ps1
new file mode 100644
index 00000000..52306fb9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-exceutequeueditems.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\exceutequeueditems.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/90-exceutequeueditems.ps1 b/coin/provisioning/qtci-windows-7-x86/90-exceutequeueditems.ps1
new file mode 100644
index 00000000..52306fb9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/90-exceutequeueditems.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\exceutequeueditems.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86_64/90-exceutequeueditems.ps1 b/coin/provisioning/qtci-windows-7-x86_64/90-exceutequeueditems.ps1
new file mode 100644
index 00000000..52306fb9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86_64/90-exceutequeueditems.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\exceutequeueditems.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/90-exceutequeueditems.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-exceutequeueditems.ps1
new file mode 100644
index 00000000..52306fb9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/90-exceutequeueditems.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\exceutequeueditems.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/90-exceutequeueditems.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/90-exceutequeueditems.ps1
new file mode 100644
index 00000000..52306fb9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/90-exceutequeueditems.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\exceutequeueditems.ps1"

From 3410bab2783875403e43ae8875901da3605ece23 Mon Sep 17 00:00:00 2001
From: Heikki Halmet <heikki.halmet@qt.io>
Date: Wed, 28 Feb 2018 13:34:15 +0200
Subject: [PATCH 12/18] Provisioning: Fix Squish installation for msvc14 32-bit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTQAINFRA-1809
Change-Id: I8a2947fe52535e39b0817fec2ee0c35bb09e4060
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
---
 coin/provisioning/common/windows/squishInstall.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index 504b0077..31ae8264 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -147,12 +147,12 @@ if  ($OSVersion -eq "Windows 7 Enterprise") {
     $squishPackage = "msvc14"
     $squishPackage64bit = "msvc14_64"
 
-    Write-Host "Installing $squishPackage"
-    DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage
-
     if (Is64BitWinHost) {
         Write-Host "Installing $squishPackage64bit"
         DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage
         Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
     }
+
+    Write-Host "Installing $squishPackage"
+    DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage
 }

From 940ef0a4cc551f31f82b99ae8adeb3544720b340 Mon Sep 17 00:00:00 2001
From: Joni Jantti <joni.jantti@qt.io>
Date: Thu, 1 Mar 2018 13:04:25 +0200
Subject: [PATCH 13/18] Provisioning: win8.1 - RTA required provisioning
 scripts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently Windows 8.1 platforms have been removed from CI. RTA
however still uses them for testing so we need to add the programs
that RTA uses.

Task-number: QTQAINFRA-1524
Change-Id: Ide9fa076dc965b16b96f610541ace6088543f795
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 .../common/windows/msvc-2013-update5.ps1      | 50 +++++++++++++++++++
 .../01-allow-remote-desktop-access.ps1        |  1 +
 .../qtci-windows-8.1-x86/01-disable-uac.ps1   |  1 +
 .../qtci-windows-8.1-x86/02-disable-ntp.ps1   |  1 +
 .../qtci-windows-8.1-x86/02-disable-sleep.ps1 |  1 +
 .../03-install-sevenzip.ps1                   |  1 +
 .../04-disable-windefender.ps1                |  1 +
 .../04-disable-windows-updates.ps1            |  1 +
 .../qtci-windows-8.1-x86/05-wsearch-off.ps1   |  1 +
 .../qtci-windows-8.1-x86/08-install-jdk.ps1   |  1 +
 .../09-msvc-2013-update5.ps1                  |  1 +
 .../qtci-windows-8.1-x86/09-openssl.ps1       |  1 +
 .../09-set-network-test-server.ps1            |  1 +
 .../01-allow-remote-desktop-access.ps1        |  1 +
 .../01-disable-uac.ps1                        |  1 +
 .../02-disable-ntp.ps1                        |  1 +
 .../02-disable-sleep.ps1                      |  1 +
 .../03-install-sevenzip.ps1                   |  1 +
 .../04-disable-windefender.ps1                |  1 +
 .../04-disable-windows-updates.ps1            |  1 +
 .../05-wsearch-off.ps1                        |  1 +
 .../08-install-jdk.ps1                        |  1 +
 .../08-msvc-2013-update5.ps1                  |  1 +
 .../09-install-dependencywalker.ps1           |  1 +
 .../qtci-windows-8.1-x86_64/09-openssl.ps1    |  1 +
 .../09-set-network-test-server.ps1            |  1 +
 26 files changed, 75 insertions(+)
 create mode 100644 coin/provisioning/common/windows/msvc-2013-update5.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1

diff --git a/coin/provisioning/common/windows/msvc-2013-update5.ps1 b/coin/provisioning/common/windows/msvc-2013-update5.ps1
new file mode 100644
index 00000000..f28d8f0b
--- /dev/null
+++ b/coin/provisioning/common/windows/msvc-2013-update5.ps1
@@ -0,0 +1,50 @@
+#############################################################################
+##
+## 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"
+
+# Install Visual Studio 2013 update 5
+
+$version = "2013 Update 5 (KB2829760)"
+$package = "C:\Windows\Temp\vs12-kb2829760.exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe"
+
+Write-Output "Fetching patch for Visual Studio $version..."
+Copy-Item $url_cache $package
+
+Write-Output "Installing Update 5 for Visual Studio $version..."
+Start-Process -FilePath $package -ArgumentList "/norestart /passive" -Wait
+
+Write-Output "Removing $package ..."
+Remove-Item $package
+
+Write-Output "Visual Studio = $version" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
new file mode 100644
index 00000000..af05e838
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1
new file mode 100644
index 00000000..51eb0b2b
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-uac.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1
new file mode 100644
index 00000000..ee3b3b7d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
new file mode 100644
index 00000000..5bf811ef
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
new file mode 100644
index 00000000..a9044256
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
new file mode 100644
index 00000000..8f94b3d5
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1
new file mode 100644
index 00000000..57428310
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
new file mode 100644
index 00000000..eed6b734
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1
new file mode 100644
index 00000000..15065b55
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-jdk.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1
new file mode 100644
index 00000000..ab7025bf
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\msvc-2013-update5.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1
new file mode 100644
index 00000000..d57ad1cd
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1
new file mode 100644
index 00000000..7918fabf
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
new file mode 100644
index 00000000..af05e838
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1
new file mode 100644
index 00000000..51eb0b2b
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-uac.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1
new file mode 100644
index 00000000..ee3b3b7d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1
new file mode 100644
index 00000000..5bf811ef
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
new file mode 100644
index 00000000..a9044256
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1
new file mode 100644
index 00000000..8f94b3d5
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1
new file mode 100644
index 00000000..57428310
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
new file mode 100644
index 00000000..eed6b734
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1
new file mode 100644
index 00000000..15065b55
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-jdk.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
new file mode 100644
index 00000000..ab7025bf
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\msvc-2013-update5.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1
new file mode 100644
index 00000000..331de489
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1
new file mode 100644
index 00000000..d57ad1cd
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1
new file mode 100644
index 00000000..7918fabf
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1"

From 9cb66c01143afa2b8115507c693a7266a31da6bb Mon Sep 17 00:00:00 2001
From: Rainer Keller <Rainer.Keller@qt.io>
Date: Tue, 6 Mar 2018 15:42:25 +0100
Subject: [PATCH 14/18] Install RHEL EPEL only once

Installing twice will fail when preventing the +e injection bug
when fixing the try-catch issue.

Change-Id: I26a1b9fa235c44fe933f2f29016a80f57d47ed49
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 .../03-install-rhel-epel.sh                   | 50 +++++++++++++++++++
 .../qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh    | 12 -----
 .../08-pythondev.sh                           |  9 ----
 3 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh

diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh
new file mode 100755
index 00000000..4eb9882d
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh
@@ -0,0 +1,50 @@
+#!/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$
+##
+#############################################################################
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+
+package="epel-release-7-11.noarch.rpm"
+primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package"
+cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package"
+sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854"
+targetFile="/tmp/$package"
+
+DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
+
+sudo rpm -ivh "$targetFile"
+rm "$targetFile"
+
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh
index d95f4f21..45565766 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh
@@ -35,21 +35,9 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-
 name="p7zip"
 version="7-11"
-package="epel-release-$version.noarch.rpm"
-primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package"
-cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package"
-sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854"
-targetFile="/tmp/$package"
-
-DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
-
-sudo rpm -ivh "$targetFile"
 sudo yum -y install "$name"
-sudo rm "$targetFile"
 
 # Link 7za to 7z so we can use existing installation scripts
 sudo ln -s /usr/bin/7za /usr/bin/7z
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh
index 20e82868..41f181b2 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh
@@ -37,15 +37,6 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
-packageEpel="epel-release-latest-7.noarch.rpm"
-OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel"
-CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$packageEpel"
-SHA1="5512b80e5b71f2370d8419fa16a0bc14c5edf854"
-
-DownloadURL $OfficialUrl $CachedUrl $SHA1 ./$packageEpel
-sudo rpm -Uvh $packageEpel
-sudo rm -f $packageEpel
-
 # install python3
 sudo yum install -y python34-devel
 

From 00e3a0149a9da44a90400a232aeb481770170dea Mon Sep 17 00:00:00 2001
From: Rainer Keller <Rainer.Keller@qt.io>
Date: Tue, 6 Mar 2018 16:25:02 +0100
Subject: [PATCH 15/18] Properly download and install RHEL EPEL repo

Use the same approach as in the other scripts.

Change-Id: Ie48103e2c4a528a9d29318c4cabd6ead71dc5c2c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 .../03-install-rhel-epel.sh                   | 48 +++++++++++++++++++
 .../08-pythondev.sh                           |  5 --
 2 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh

diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh
new file mode 100755
index 00000000..e31f4869
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh
@@ -0,0 +1,48 @@
+#!/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$
+##
+#############################################################################
+
+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"
+
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
index 552e7586..6152c7e5 100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
@@ -7,11 +7,6 @@ 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
 

From 04d1ee1df4302c78be54da76826221661ff25056 Mon Sep 17 00:00:00 2001
From: Rainer Keller <Rainer.Keller@qt.io>
Date: Thu, 8 Mar 2018 08:24:33 +0100
Subject: [PATCH 16/18] Provisioning: Create symbolic for shasum tool on macOS
 for compatibility
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On macOS the sha1 tool is named 'shasum' while on all other unix systems
it is called 'sha1sum'. In order to make all unix provisioning scripts
run on macOS without special case handling a symbolic link is created.

Change-Id: Ib1365cbb0dcb31e68a22959ce939fb450ec7e3f7
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 .../common/macos/sha1sum-compatibility.sh     | 49 +++++++++++++++++++
 coin/provisioning/common/unix/DownloadURL.sh  |  2 +-
 coin/provisioning/common/unix/libclang.sh     |  7 +--
 .../01-sha1sum-compatibility.sh               |  1 +
 .../01-sha1sum-compatibility.sh               |  1 +
 .../01-sha1sum-compatibility.sh               |  1 +
 6 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100755 coin/provisioning/common/macos/sha1sum-compatibility.sh
 create mode 120000 coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh
 create mode 120000 coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh
 create mode 120000 coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh

diff --git a/coin/provisioning/common/macos/sha1sum-compatibility.sh b/coin/provisioning/common/macos/sha1sum-compatibility.sh
new file mode 100755
index 00000000..5080f8fc
--- /dev/null
+++ b/coin/provisioning/common/macos/sha1sum-compatibility.sh
@@ -0,0 +1,49 @@
+#!/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$
+##
+#############################################################################
+
+# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'.
+# In order to make all unix provioning scripts run on macOS without special case handling
+# a symbolic link is created.
+# The shasum tool is a perl script which does some globbing to determine the perl version. The
+# symbolic link has to point directly to the binary including the perl version.
+# Additionally the CI seems to have multiple parallel perl versions installed which causes
+# multiple shasum tools to be present (shasum5.16, shasum5.18).
+#
+# Currently this is
+#     /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
+
+[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
+SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
+sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum
diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh
index cb890e8a..d3a8a7d0 100755
--- a/coin/provisioning/common/unix/DownloadURL.sh
+++ b/coin/provisioning/common/unix/DownloadURL.sh
@@ -71,7 +71,7 @@ function DownloadURL {
         }
         echo "Checking SHA1 on PKG '$targetFile'"
         echo "$expectedSha1 *$targetFile" > $targetFile.sha1
-        shasum --check $targetFile.sha1 || throw $ExceptionSHA1
+        sha1sum --check $targetFile.sha1 || throw $ExceptionSHA1
     )
 
     catch || {
diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index d59c9fa2..7f29259e 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -60,12 +60,7 @@ zip="libclang.7z"
 destination="/usr/local/libclang-$version"
 
 curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url"
-_shasum=sha1sum
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    echo "DARWIN"
-    _shasum=/usr/bin/shasum
-fi
-echo "$sha1  $zip" | $_shasum --check
+echo "$sha1  $zip" | sha1sum --check
 7z x $zip -o/tmp/
 rm -rf $zip
 
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh
new file mode 120000
index 00000000..58a40af4
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh
@@ -0,0 +1 @@
+../common/macos/sha1sum-compatibility.sh
\ No newline at end of file
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh
new file mode 120000
index 00000000..58a40af4
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh
@@ -0,0 +1 @@
+../common/macos/sha1sum-compatibility.sh
\ No newline at end of file
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh
new file mode 120000
index 00000000..58a40af4
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh
@@ -0,0 +1 @@
+../common/macos/sha1sum-compatibility.sh
\ No newline at end of file

From b85b272c26810e54a4ceb0707cf4569f87517b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= <tony.sarajarvi@qt.io>
Date: Wed, 7 Mar 2018 10:22:26 +0200
Subject: [PATCH 17/18] Move MSVC2017 x86 builds to 64bit host OS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I7544c12086ef8a437bca575dfce7de44ec9938a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 coin/platform_configs/qt5.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 36d8f5eb..ddcd2d97 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,7 +1,7 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86-6                                       MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests

From 5bbeaf6c0d4fe3b5b81ff9003c4bdba1e4991813 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Sat, 10 Mar 2018 09:14:36 +0100
Subject: [PATCH 18/18] Update qtwebengine only

Change-Id: I1396d561892a5fead56775906ecd8aa7c48ba187
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 qtwebengine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qtwebengine b/qtwebengine
index 49db723a..1bda2052 160000
--- a/qtwebengine
+++ b/qtwebengine
@@ -1 +1 @@
-Subproject commit 49db723a10c4ab9144d7b84b4d6dd38bd6bab65a
+Subproject commit 1bda20527b2c880e3f88926605ea37f9b67de26e