Merge remote-tracking branch 'origin/5.13' into 5.13.0

Change-Id: If2321aae395ea99c0fb4cf4ef7b3c5a580d3357e

27 files changed, 85 insertions, 11 deletions

diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 29a20a07..177d9aa6 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -12,17 +12,17 @@ qtci-linux-Ubuntu-18.04-x86_64                                      GCC
 qtci-linux-openSUSE-15.0-x86_64                                     GCC                         DeveloperBuild NoPch
 qtci-linux-openSUSE-15.0-x86_64                                     ICC_18                      DeveloperBuild NoPch DisableTests SystemSQLite
 qtci-linux-openSUSE-15.0-x86_64     WebAssembly                     GCC                         Packaging Release NoPch DisableTests
-qtci-linux-RHEL-7.4-x86_64                                          GCC                         Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
+qtci-linux-RHEL-7.6-x86_64                                          GCC                         Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
 qtci-macos-10.13-x86_64-2                                           Clang                       Packaging DebugAndRelease Release
 qtci-macos-10.12-x86_64-9                                           Clang                       DeveloperBuild NoFramework Release QtNamespace NoPch
 qtci-macos-10.13-x86_64-2           IOS_ANY             multi       Clang                       Packaging DebugAndRelease DisableTests Static
 qtci-macos-10.13-x86_64-2           TvOS_ANY            multi       Clang                       DebugAndRelease DisableTests
 qtci-macos-10.13-x86_64-2           WatchOS_ANY         multi       Clang                       DebugAndRelease DisableTests
-qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64          Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.6-x86_64          Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.6-x86_64          Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-Ubuntu-18.04-x86_64      QEMU                armv7       GCC                         Release
 qtci-linux-Ubuntu-18.04-x86_64      QEMU                arm64       GCC                         Release
 qtci-linux-Ubuntu-18.04-x86_64      QEMU                mips64      GCC                         Release DisableTests
 qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         TestOnly LicenseCheck
-qtci-linux-RHEL-7.4-x86_64          INTEGRITY_11_04     armv7       GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64          QNX_700             armv7       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.6-x86_64          INTEGRITY_11_04     armv7       GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.6-x86_64          QNX_700             armv7       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt
index 1001d869..314099ab 100644
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -6,7 +6,7 @@ qtci-windows-7-x86-3                                        Mingw73
 qtci-windows-10-x86_64-14                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-14   WinRT_10            armv7       MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-14   WinRT_10                        MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.6-x86_64  Android_ANY         x86         GCC         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-10-x86_64-14   Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-14   Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-14   Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
@@ -17,5 +17,5 @@ qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC
 qtci-windows-10-x86_64-14   QNX_700             armv7       Mingw73                     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-14   QNX_700             armv8       Mingw73                     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-14   QNX_700             x86_64      Mingw73                     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_64      GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.6-x86_64  QNX_700             armv8       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.6-x86_64  QNX_700             x86_64      GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 1001d869..314099ab 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -6,7 +6,7 @@ qtci-windows-7-x86-3                                        Mingw73
 qtci-windows-10-x86_64-14                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-14   WinRT_10            armv7       MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-14   WinRT_10                        MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.6-x86_64  Android_ANY         x86         GCC         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-10-x86_64-14   Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-14   Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-14   Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
@@ -17,5 +17,5 @@ qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC
 qtci-windows-10-x86_64-14   QNX_700             armv7       Mingw73                     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-14   QNX_700             armv8       Mingw73                     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-14   QNX_700             x86_64      Mingw73                     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_64      GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.6-x86_64  QNX_700             armv8       GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.6-x86_64  QNX_700             x86_64      GCC                         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1
new file mode 100644
index 00000000..0c4a9680
--- /dev/null
+++ b/coin/provisioning/common/windows/install-msys2.ps1
@@ -0,0 +1,70 @@
+############################################################################
+##
+## Copyright (C) 2019 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"
+
+# This script installs 7-Zip
+
+$version = "20181211"
+$prog = "msys2"
+if (Is64BitWinHost) {
+    $arch = "x86_64"
+    $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2"
+    $folder = "msys64"
+} else {
+    $arch = "i686"
+    $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e"
+    $folder = "msys32"
+}
+$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
+
+
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
+$url_official = "http://repo.msys2.org/distrib/$arch/$package"
+$PackagePath = "C:\Windows\Temp\$package"
+$TargetLocation = "C:\Utils"
+
+
+Download $url_official $url_cache $PackagePath
+Verify-Checksum $PackagePath $sha1
+Extract-tar_gz $PackagePath $TargetLocation
+$msys = "$TargetLocation\$folder\msys2_shell.cmd"
+
+# install perl
+Run-Executable "$msys" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
+Run-Executable "$msys" "`"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
+
+Write-Host "Cleaning $PackagePath.."
+Remove-Item -Recurse -Force -Path "$PackagePath"
+
+Write-Output "7-Zip = $version" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh
index f12cff1e..f12cff1e 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh
index 84238ebf..84238ebf 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh
index c0f94a49..c0f94a49 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-systemsetup.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh
index 548cb9ca..548cb9ca 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh
index ebc7cac6..ebc7cac6 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.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.6-x86_64/03-install-rhel-epel.sh
index 5cdf7df0..5cdf7df0 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh
index e86870c0..b956d6a3 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh
@@ -70,6 +70,7 @@ installPackages+=(speech-dispatcher-devel)
 installPackages+=(python-devel python-pip)
 # Python 3 with python-devel, pip and virtualenv
 installPackages+=(rh-python36)
+installPackages+=(python36-devel)
 # WebEngine
 installPackages+=(bison)
 installPackages+=(flex)
@@ -112,6 +113,8 @@ installPackages+=(xcb-util-renderutil-devel)
 # ODBC support
 installPackages+=(unixODBC-devel)
 installPackages+=(unixODBC)
+# Vulkan support
+installPackages+=(vulkan-devel)
 
 sudo yum -y install "${installPackages[@]}"
 
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh
index 45565766..45565766 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-p7zip.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/05-libclang.sh
index 7074cbc1..7074cbc1 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/05-libclang.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh
index 062b2790..062b2790 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh
index 92c741fb..92c741fb 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/07-qnx_700.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-integrity.sh
index 154370da..154370da 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-integrity.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-disable_selinux.sh
index b7a53cd4..b7a53cd4 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-disable_selinux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/10-openssl_for_android_linux.sh
index ef2b3ba8..ef2b3ba8 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/10-openssl_for_android_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh
index e677427f..e677427f 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/22-mqtt_broker.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-fbx.sh
index d8df4375..d8df4375 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-fbx.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh
index 7c4d46dd..7c4d46dd 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/30-install_icu.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/35-install-breakpad.sh
index 74dd1579..74dd1579 100644..100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/35-install-breakpad.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh
index a6c4dfff..a6c4dfff 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-android_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/60-install_protobuff.sh
index a77938b3..a77938b3 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/60-install_protobuff.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/90-squish.sh
index e4281588..e4281588 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/90-squish.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/99-version.sh
index 03565da2..03565da2 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/99-version.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/99-version.sh
diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1
new file mode 100644
index 00000000..be9a3634
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-msys2.ps1"