Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I7502e49bc75f84b7fb2d4534181a2082fc939265

18 files changed, 86 insertions, 19 deletions

diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index ddcd2d97..ae1f98ae 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -17,6 +17,6 @@ qtci-macos-10.12-x86_64-8   TvOS_ANY            multi       Clang       DebugAnd
 qtci-macos-10.12-x86_64-8   WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
 qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   QNX_700             x86_64      Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-linux-RHEL-7.4-x86_64  QNX_700             armv8       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64  QNX_700             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86_64      GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh
index 433748d1..97a76886 100755
--- a/coin/provisioning/common/linux/open62541.sh
+++ b/coin/provisioning/common/linux/open62541.sh
@@ -59,7 +59,7 @@ sudo pip install six
 
 git clone https://github.com/open62541/open62541.git open62541
 cd open62541
-git checkout ba3b55ab4afafe6bc9d2cb922eafd51c6cee4629
+git checkout 8845e493d7751fd4eee3917b540e5346646b9cf7
 mkdir build
 cd build
 cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib/open62541 ..
diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index f024130f..f6ff4507 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -42,6 +42,7 @@ 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
@@ -70,3 +71,9 @@ 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
diff --git a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1
index ed408b6c..049fdc1b 100644
--- a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1
+++ b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1
@@ -1,6 +1,7 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"
+$zip = Get-DownloadLocation "Qt3DStudio-3rdparty-win64-CI.zip"
+
 $url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip"
 
 Download $url $url $zip
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1
index 53c2ee17..d838fcc8 100644
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -40,7 +40,7 @@
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
 
 $version = "1.0.2o"
-$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
+$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
 $sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691"
 $destination = "C:\Utils\openssl-android-master"
 
diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1
index ace68835..ec84d706 100644
--- a/coin/provisioning/common/windows/cmake.ps1
+++ b/coin/provisioning/common/windows/cmake.ps1
@@ -36,7 +36,7 @@
 $majorminorversion = "3.6"
 $version = "3.6.2"
 
-$zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip"
+$zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
 $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
 $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"
 
diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1
index 8a4b452e..28ccaeaf 100644
--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -68,6 +68,17 @@ function BadParam
     throw("You must specify $Description")
 }
 
+function Get-DefaultDownloadLocation
+{
+    return $env:USERPROFILE + "\downloads\"
+}
+
+function Get-DownloadLocation
+{
+    Param ([string]$TargetName = $(BadParam("a target filename")))
+    return (Get-DefaultDownloadLocation) + $TargetName
+}
+
 function Download
 {
     Param (
diff --git a/coin/provisioning/common/windows/jom.ps1 b/coin/provisioning/common/windows/jom.ps1
index 68db6b17..7c59c61c 100644
--- a/coin/provisioning/common/windows/jom.ps1
+++ b/coin/provisioning/common/windows/jom.ps1
@@ -1,6 +1,6 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = "c:\users\qt\downloads\jom_1_1_2.zip"
+$zip = Get-DownloadLocation "jom_1_1_2.zip"
 
 Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip
 Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"
diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1
index 5ba0a0aa..b0705105 100644
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -16,7 +16,7 @@ Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
     $libclang_version = $libclang_version -replace '["."]'
 }
 
-$zip = "c:\users\qt\downloads\libclang.7z"
+$zip = Get-DownloadLocation "libclang.7z"
 $baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain
 
 function setURL() {
@@ -86,3 +86,9 @@ if ( $setDefault ) {
 }
 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"
+}
diff --git a/coin/provisioning/common/windows/libusb.ps1 b/coin/provisioning/common/windows/libusb.ps1
index 3207131b..68375263 100644
--- a/coin/provisioning/common/windows/libusb.ps1
+++ b/coin/provisioning/common/windows/libusb.ps1
@@ -35,7 +35,7 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196-msvc2015.7z"
+$archive = Get-DownloadLocation "libusb-1.0.21-ife3db79196-msvc2015.7z"
 $libusb_location = "C:\Utils\libusb-1.0"
 
 Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive
diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1
index 205d9c95..a80e23dd 100644
--- a/coin/provisioning/common/windows/mqtt_broker.ps1
+++ b/coin/provisioning/common/windows/mqtt_broker.ps1
@@ -34,7 +34,7 @@
 . "$PSScriptRoot\helpers.ps1"
 
 Write-Host "MQTT: Downloading Paho test broker..."
-$zip = "c:\users\qt\downloads\pahotest.zip"
+$zip = Get-DownloadLocation "pahotest.zip"
 $externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
 $internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
 $sha1 = "532fe145096cdd8d679f425cbfd883289150c968"
diff --git a/coin/provisioning/common/windows/ninja.ps1 b/coin/provisioning/common/windows/ninja.ps1
index 5b6729f5..95932c61 100644
--- a/coin/provisioning/common/windows/ninja.ps1
+++ b/coin/provisioning/common/windows/ninja.ps1
@@ -1,6 +1,6 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = "c:\users\qt\downloads\ninja-1.6.0-win-x86.zip"
+$zip = Get-DownloadLocation "ninja-1.6.0-win-x86.zip"
 
 Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
 Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"
diff --git a/coin/provisioning/common/windows/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1
index 9cdd04ab..cab71f50 100644
--- a/coin/provisioning/common/windows/winrtrunner.ps1
+++ b/coin/provisioning/common/windows/winrtrunner.ps1
@@ -1,10 +1,11 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = "c:\users\qt\downloads\winrtrunner.zip"
-$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip"
+$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 $zip
-Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42"
+Download $url $url_cache $zip
+Verify-Checksum $zip "b83f2166b5799910a661d1db02771edf94880785"
 Extract-7Zip $zip C:\Utils\winrtrunner
 Remove-Item -Path $zip
 
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh
new file mode 100755
index 00000000..5f3715de
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the 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"
+SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
+
+"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"
diff --git a/coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1 b/coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1
deleted file mode 100644
index 13b1ec60..00000000
--- a/coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\set-proxy.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1 b/coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1
deleted file mode 100644
index 0c25a0fb..00000000
--- a/coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\unset-proxy.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
index 991ccfa6..821c513e 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
@@ -35,7 +35,7 @@
 
 # This script installs QNX SDP 7.0
 
-$zip = "c:\users\qt\downloads\qnx700.7z"
+$zip = Get-DownloadLocation "qnx700.7z"
 $url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z"
 
 Download $url $url $zip
diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
index be52fb2a..24d7a5ca 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
@@ -5,7 +5,7 @@
 $version = "1.0.11"
 $url = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msys-$version.7z"
 
-$zip = "c:\users\qt\downloads\msys-$version.7z"
+$zip = Get-DownloadLocation ("msys-$version.7z")
 $sha1 = "22cd76f1263db8c72727a9537228c481ff33c285"
 $destination = "C:\msys"