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

Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh

+#!/bin/bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/cmake_linux.sh
+

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh

-#!/bin/bash
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-sudo zypper -nq install python-devel python-virtualenv
-
-# install python3
-sudo zypper -nq install python3 python3-pip python3-virtualenv

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh → coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh

-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+
+set -ex
 
 BASEDIR=$(dirname "$0")
 source $BASEDIR/../common/network_test_server_ip.txt
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
 
@@ -11,3 +13,8 @@ echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | su
 echo "Set DISPLAY"
 echo 'export DISPLAY=":0"' >> ~/.bashrc
 
+if [ "$proxy" != "" ]; then
+    sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy
+    sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy
+fi
+

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

-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+
+set -ex
 
 sudo zypper -nq install git
 sudo zypper -nq install gcc7

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh

 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/sw_versions.txt
 VERSION=$libclang_version

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

+#!/usr/bin/env bash
 # provides: python development libraries
 # version: provided by default Linux distribution repository
 # needed to build pyside
+
+set -ex
+
 sudo pkcon -y refresh
 sudo pkcon -y install python-devel python-virtualenv
 

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh → coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh

 #!/usr/bin/env bash
+
+set -ex
+
 $(dirname $0)/../common/cmake_linux.sh

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

-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,7 +37,7 @@
 
 source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
 
-set -e
+set -ex
 
 mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input"
 localMount="/mnt/storage/"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh

+#!/usr/bin/env bash
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -ex
+
+# Having proxy set while running autotests makes them fail
+sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy
+

coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh → coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh

-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
 
 # Read .bashrc if exist
 printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n        . ~/.bashrc\nfi\n" >> ~/.bash_profile

coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh → coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,6 +33,8 @@
 ##
 #############################################################################
 
+set -ex
+
 # This script modified system settings for automated use
 
 # shellcheck source=../common/try_catch.sh
@@ -126,4 +128,3 @@ catch || {
         ;;
     esac
 }
-

coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh → coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh

-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
 defaults write com.apple.CrashReporter DialogType server

coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh → coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh

-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
 # Enables the usage of temporary keychains for SSL autotests
 echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc

coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh → coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,6 +37,8 @@
 
 # XZ-Utils are needed for uncompressing xz-compressed files
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh → coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -34,6 +34,9 @@
 #############################################################################
 
 # This script installs JDK
+
+set -ex
+
 echo "Installing Java Development Kit"
 
 # shellcheck source=../common/try_catch.sh

coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh → coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -42,6 +42,8 @@
 # This will give you a file called "Content.part00.cpio.xz" that
 # can be renamed to Xcode_8.xz for this script.
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh → coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -32,6 +32,9 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh"
 
 version="8.3.2"

coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh → coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh

 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/cmake.sh

coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh → coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh

 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 $BASEDIR/../common/homebrew.sh

coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh → coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh

-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,6 +37,8 @@
 
 # MySQL is needed for Qt to be able to support MySQL
 
+set -ex
+
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"