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

Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
	coin/provisioning/common/system_updates.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94

2 files changed, 9 insertions, 53 deletions

diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh
new file mode 100755
index 00000000..abbda212
--- /dev/null
+++ b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+. $BASEDIR/../common/sw_versions.txt
+VERSION=$libclang_version
+URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
+SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
+
+$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION"
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh
deleted file mode 100644
index dd35e01d..00000000
--- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script installs CMake 3.6.2
-
-# CMake is needed for autotests that verify that Qt can be built with CMake
-
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
-
-version="3.6.2"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
-SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
-targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
-
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-
-echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc