Merge remote-tracking branch 'origin/5.9' into 5.10

Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250

23 files changed, 85 insertions, 56 deletions

diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh
index c60fae21..cb890e8a 100644..100755
--- a/coin/provisioning/common/DownloadURL.sh
+++ b/coin/provisioning/common/DownloadURL.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
index 2af2db10..bb7f772f 100644..100755
--- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
index df84431a..fb77b714 100644..100755
--- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/InstallPKGFromURL.sh
index c00b646c..bf834e5d 100644..100755
--- a/coin/provisioning/common/InstallPKGFromURL.sh
+++ b/coin/provisioning/common/InstallPKGFromURL.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh
index ee3008c1..c218ffe4 100644..100755
--- a/coin/provisioning/common/android_linux.sh
+++ b/coin/provisioning/common/android_linux.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -39,6 +39,7 @@
 
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
@@ -79,10 +80,20 @@ try
     rm "$toolsTargetFile" || throw $ExceptionRmTools
 
     echo "Changing ownership of Android files."
-    sudo chown -R qt:wheel "$targetFolder"
+    if uname -a |grep -q "el6\|el7"; then
+        sudo chown -R qt:wheel "$targetFolder"
+    else
+        sudo chown -R qt:users "$targetFolder"
+    fi
 
     echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
-    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+    if [ "$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" || throw $ExceptionSdkManager
+    else
+        echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+    fi
 
     echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
     echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc
diff --git a/coin/provisioning/common/check_and_set_proxy.sh b/coin/provisioning/common/check_and_set_proxy.sh
new file mode 100755
index 00000000..8dad878c
--- /dev/null
+++ b/coin/provisioning/common/check_and_set_proxy.sh
@@ -0,0 +1,50 @@
+#!/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%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/http_proxy.txt"
+
+try
+(
+  wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io
+)
+
+if [ $? -eq 0 ]; then
+    echo "Setting http_proxy to $proxy"
+    export http_proxy=$proxy
+
+else
+    echo "Proxy not detected at $proxy"
+fi
+
diff --git a/coin/provisioning/common/cmake.sh b/coin/provisioning/common/cmake.sh
index e10dd41d..c727c8ff 100755
--- a/coin/provisioning/common/cmake.sh
+++ b/coin/provisioning/common/cmake.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh
index 701d9081..35313d3c 100755
--- a/coin/provisioning/common/cmake_linux.sh
+++ b/coin/provisioning/common/cmake_linux.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/disable_selinux.sh b/coin/provisioning/common/disable_selinux.sh
index 30162166..30162166 100644..100755
--- a/coin/provisioning/common/disable_selinux.sh
+++ b/coin/provisioning/common/disable_selinux.sh
diff --git a/coin/provisioning/common/fbx_linux.sh b/coin/provisioning/common/fbx_linux.sh
index 66d4793b..9827f9ab 100755
--- a/coin/provisioning/common/fbx_linux.sh
+++ b/coin/provisioning/common/fbx_linux.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/fbx_macos.sh
index 66a2d998..0f5e16a3 100755
--- a/coin/provisioning/common/fbx_macos.sh
+++ b/coin/provisioning/common/fbx_macos.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
diff --git a/coin/provisioning/common/http_proxy.txt b/coin/provisioning/common/http_proxy.txt
new file mode 100644
index 00000000..3aa6ceba
--- /dev/null
+++ b/coin/provisioning/common/http_proxy.txt
@@ -0,0 +1,2 @@
+proxy="http://proxy.intra.qt.io:3128"
+
diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1
index 16dd8a6f..c08748d8 100644
--- a/coin/provisioning/common/icu.ps1
+++ b/coin/provisioning/common/icu.ps1
@@ -39,29 +39,12 @@ $version = "53_1"
 
 if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
 
-   $url_official_2012 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_64_devel.7z"
-   $url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z"
-   $sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC"
-
    $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_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z"
    $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z"
 
-   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) {
-      echo "Fetching from URL ..."
-      Download $url_official_2012 $url_cache_2012 $icuPackage_msvc2012_64
-      Verify-Checksum $icuPackage_msvc2012_64 $sha1_2012
-      Get-ChildItem $icuPackage_msvc2012_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_64_devel\""}
-
-      echo "Cleaning $icuPackage_msvc2012_64..."
-      Remove-Item -Recurse -Force $icuPackage_msvc2012_64
-
-      echo "ICU MSVC2012 = $version" >> ~\versions.txt
-   }
-
    if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) {
       echo "Fetching from URL ..."
       Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64
@@ -75,7 +58,6 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
    }
 
 # FIXME: do we really want to have it per MSVC version? What about MSVC2015?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
 [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?
@@ -83,29 +65,12 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
 
 } else {
 
-   $url_official_2012_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_32_devel.7z"
-   $url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z"
-   $sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0"
-
    $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_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z"
    $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z"
 
-   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) {
-      echo "Fetching from URL ..."
-      Download $url_official_2012_32 $url_cache_2012_32 $icuPackage_msvc2012_32
-      Verify-Checksum $icuPackage_msvc2012_32 $sha1_2012_32
-      Get-ChildItem $icuPackage_msvc2012_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_32_devel\""}
-
-      echo "Cleaning $icuPackage_msvc2012_32..."
-      Remove-Item -Recurse -Force $icuPackage_msvc2012_32
-
-      echo "ICU MSVC2012 = $version" >> ~\versions.txt
-   }
-
    if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) {
       echo "Fetching from URL ..."
       Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32
@@ -119,7 +84,6 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
    }
 
 # FIXME: do we really want to have it per MSVC version? What about MSVC2015?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_32_devel\\icu53_1", "Machine")
 [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine")
 
 }
diff --git a/coin/provisioning/common/install-commandlinetools.sh b/coin/provisioning/common/install-commandlinetools.sh
index f224d31d..876d0b9c 100644..100755
--- a/coin/provisioning/common/install-commandlinetools.sh
+++ b/coin/provisioning/common/install-commandlinetools.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/install_xcode.sh
index c6f00ee7..5d8009e3 100755
--- a/coin/provisioning/common/install_xcode.sh
+++ b/coin/provisioning/common/install_xcode.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/integrity.sh b/coin/provisioning/common/integrity.sh
index 6998866a..6c96d9e0 100755
--- a/coin/provisioning/common/integrity.sh
+++ b/coin/provisioning/common/integrity.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/libclang.sh b/coin/provisioning/common/libclang.sh
index 381127b1..ea33d62d 100755
--- a/coin/provisioning/common/libclang.sh
+++ b/coin/provisioning/common/libclang.sh
@@ -40,6 +40,8 @@
 # In case of Linux, we expect to get the values as args
 set -e
 
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
+
 BASEDIR=$(dirname "$0")
 . $BASEDIR/sw_versions.txt
 url=$1
diff --git a/coin/provisioning/common/openssl_for_android_linux.sh b/coin/provisioning/common/openssl_for_android_linux.sh
index 70684eaf..2ca38db9 100644..100755
--- a/coin/provisioning/common/openssl_for_android_linux.sh
+++ b/coin/provisioning/common/openssl_for_android_linux.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/python3.sh
index 31591339..fc20aa2d 100755
--- a/coin/provisioning/common/python3.sh
+++ b/coin/provisioning/common/python3.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/qnx_700.sh
index 1f1c0f3f..73783468 100644..100755
--- a/coin/provisioning/common/qnx_700.sh
+++ b/coin/provisioning/common/qnx_700.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/system_updates.sh b/coin/provisioning/common/system_updates.sh
index 2dee2708..0736d740 100755
--- a/coin/provisioning/common/system_updates.sh
+++ b/coin/provisioning/common/system_updates.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/try_catch.sh b/coin/provisioning/common/try_catch.sh
index b21861e3..560d040d 100644..100755
--- a/coin/provisioning/common/try_catch.sh
+++ b/coin/provisioning/common/try_catch.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/version.sh
index e7662e1e..ed24d805 100755
--- a/coin/provisioning/common/version.sh
+++ b/coin/provisioning/common/version.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##