Update submodules on '5.13' in qt5

Change-Id: I87f15314cf01a1b0482b1675c1eeaed380d92a3d Reviewed-by: Liang Qi <liang.qi@qt.io>
2026-02-27 01:15:30 +08:00 · 2019-03-13 09:12:10 +00:00 · 2019-03-11 05:16:35 +00:00 · 2019-03-08 12:09:53 +00:00 · 2019-03-05 06:41:28 +00:00 · 2019-03-02 21:38:04 +00:00
54 changed files with 211 additions and 158 deletions
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,6 +1,6 @@
 Template                            Target OS           Target arch Compiler    Target Compiler Features
 ----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10                                           MSVC2015                    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
+qtci-windows-10-x86_64-10                                           MSVC2015                    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle
 qtci-windows-7-x86-3                                                Mingw73                     DeveloperBuild Release OpenGLDynamic
 qtci-windows-10-x86_64-10                               x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10                                           MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -1,22 +0,0 @@
-Template                    Target OS           Target arch Compiler    Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-7-x86-3                                        Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10   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-windows-7-x86-3        Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3        Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-3        Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2
-qtci-macos-10.13-x86_64-2   QNX_700             x86         GCC                         Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             armv8       Mingw73                     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   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
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -0,0 +1 @@
+qt5.txt
--- a/coin/platform_configs/qtsaferenderer.txt
+++ b/coin/platform_configs/qtsaferenderer.txt
@@ -0,0 +1,3 @@
+Template                            Target OS           Target arch Compiler    Features
+----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-10-x86_64-10                                           Mingw73     DeveloperBuild Release OpenGLDynamic BuildExamples
--- a/coin/platform_configs/tqtc-qtsaferenderer.txt
+++ b/coin/platform_configs/tqtc-qtsaferenderer.txt
@@ -1,4 +0,0 @@
-Template                            Target OS           Target arch Compiler    Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
-qtci-linux-RHEL-7.4-x86_64          QNX_700             armv7       GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
--- a/coin/provisioning/common/linux/emsdk.sh
+++ b/coin/provisioning/common/linux/emsdk.sh
@@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"

-version="1.38.1"
+version="1.38.27"
 version_node="8.9.1"
 urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz"
 urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
@@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten
 urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
 urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz"
 urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz"
-sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3"
-sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7"
+sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161"
+sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb"
 sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
 targetFolder="/opt/emsdk"
 sudo mkdir "$targetFolder"
--- a/coin/provisioning/common/unix/install_protobuff.sh
+++ b/coin/provisioning/common/unix/install_protobuff.sh
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2018 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$
+##
+#############################################################################
+
+# shellcheck source=./DownloadURL.sh
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+# shellcheck source=./SetEnvVar.sh
+source "${BASH_SOURCE%/*}/SetEnvVar.sh"
+
+# This script will install Google's Protocal Buffers which is needed by Automotive Suite
+
+version="3.6.1"
+sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
+internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
+externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
+
+targetDir="$HOME/protobuf-$version"
+targetFile="$targetDir.zip"
+DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
+unzip "$targetFile" -d "$HOME"
+sudo rm "$targetFile"
+
+# devtoolset is needed when running configuration
+if uname -a |grep -qv "Darwin"; then
+    export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
+fi
+
+echo "Configuring and building protobuf"
+cd "$targetDir"
+if uname -a |grep -q Darwin; then
+    ./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local"
+    SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin"
+else
+    ./configure
+fi
+make
+sudo make install
+
+# Refresh shared library cache if OS isn't macOS
+if uname -a |grep -qv "Darwin"; then
+    sudo ldconfig
+fi
+
+sudo rm -r "$targetDir"
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -53,10 +53,6 @@ Rename-Item C:\Utils\openssl-$version $destination
 Remove-Item -Path $zip
 Remove-Item C:\Utils\openssl-$version.tar

-# Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang"
-# Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar"
-# Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr"
-
 # Make sure configure for openssl has a "make" and "perl" available
 $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"

--- a/coin/provisioning/common/windows/dxsdk.ps1
+++ b/coin/provisioning/common/windows/dxsdk.ps1
@@ -4,16 +4,16 @@

 $package = "DXSDK_Jun10.exe"

-$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
+$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
 $officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package"
-$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
-$exe = "C:\Windows\Temp\$package"
-
-Download $officialUrl $cachedUrl $exe
+$sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
+$package_path = "C:\Windows\Temp\$package"

+Download $officialUrl $cachedUrl $package_path
+Verify-Checksum $package_path $sdkChecksumSha1 sha1
 Write-Host "Installing DirectX SDK"
-Run-Executable $exe "/u"
+Run-Executable $package_path "/u"

-Remove-Item -Path $exe
+Remove-Item -Path $package_path

 Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt
--- a/coin/provisioning/common/windows/install-protobuf.ps1
+++ b/coin/provisioning/common/windows/install-protobuf.ps1
@@ -0,0 +1,64 @@
+#############################################################################
+##
+## 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 will install Google's Protocol Buffers
+# Script requires Cmake to be installed and strawberry-perl not to be installed
+
+$version = "3.6.1"
+$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
+$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
+$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip"
+$zip = "C:\Utils\protobuf-all-$version.zip"
+$installationFolder = "C:\Utils\protobuf"
+
+Write-Host "Installing Protocol Buffers"
+Add-Path "C:\CMake\bin"
+Download "$officialUrl" "$cachedUrl" "$zip"
+Verify-Checksum "$zip" "$sha1"
+Extract-7Zip "$zip" C:\Utils
+New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build"
+New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build\release"
+New-Item -ItemType directory -Force -Path "$installationFolder"
+cd "C:\Utils\protobuf-$version\cmake\build\release"
+cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && cmake -G `"NMake Makefiles`" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$installationFolder ../.. && nmake && nmake install"
+if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){
+    Write-Host "Can't find $installationFolder\bin\protoc.exe. Installation probably failed!"
+    exit 1
+}
+
+Remove-Item "$zip"
+
+Add-Path "$installationFolder\bin"
+Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include"
+Set-EnvironmentVariable PROTOBUF_LIB "$installationFolder\lib"
--- a/coin/provisioning/common/windows/mysql.ps1
+++ b/coin/provisioning/common/windows/mysql.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
@@ -36,7 +36,7 @@
 # This script installs MySQL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine

-$version = "5.6.11"
+$version = "5.7.25"
 $baseNameX64 = "mysql-$version-winx64"
 $packagex64 = "C:\Windows\temp\$baseNameX64.zip"
 $baseNameX86 = "mysql-$version-win32"
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/60-install_protobuff.sh
@@ -35,29 +35,6 @@

 set -ex

-# Download and install the Docker Toolbox for macOS (Docker Compose and Docker Machine).
-url="https://download.docker.com/mac/stable/DockerToolbox.pkg"
-target_file="DockerToolbox.pkg"
+# shellcheck source=../common/unix/install_protobuff.sh
+source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"

-if [ -x "$(command -v sha1sum)" ]
-then
-    # This part shall be used in CI environment only. The DownloadURL script needs sha1sum
-    # which is not included in the default macOS system. In addition, the cached pkg can't
-    # be downloaded out of the Qt internal network.
-    case ${BASH_SOURCE[0]} in
-        */macos/*) UNIX_PATH="${BASH_SOURCE[0]%/macos/*}/unix" ;;
-        */*) UNIX_PATH="${BASH_SOURCE[0]%/*}/../unix" ;;
-        *) UNIX_PATH="../unix" ;;
-    esac
-
-    source "$UNIX_PATH/DownloadURL.sh"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.pkg"
-    sha1="7196d2d30648d486978d29adb5837ff7876517c1"
-    DownloadURL $url_cached $url $sha1 $target_file
-else
-    curl $url -o $target_file
-fi
-sudo installer -pkg $target_file -target /
-
-# Start testserver provisioning
-source "${BASH_SOURCE%/*}/docker_testserver.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"

 echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..."

-versionARM="2.3.4"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
-SHA1="db7a0f4f9ddd5992a563d5348889021a7ceb1c56"
+versionARM="2.5.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-409ebc3.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package"
+SHA1="a03b4eb492b16c6e60cf83c0718c27e9cfa6d522"
 yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
 yoctoLocationARMv7="/opt/yocto-armv7"
 sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi"
@@ -60,11 +60,11 @@ rm -rf "$yoctoInstaller"

 echo "Installing Yocto toolchain for 64-bit b2qt ARM64..."

-versionARM64="2.3.4"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
-SHA1="5dcae7c6cbc266798ba49a9e51fff1f06790729d"
+versionARM64="2.5.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-409ebc3.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package"
+SHA1="3dadf1135d00f7cb5586b605b1f7344ae828c9cd"
 yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
 yoctoLocationARM64="/opt/yocto-arm64"
 sysrootARM64="sysroots/aarch64-poky-linux"
--- a/coin/provisioning/qtci-macos-10.12-x86_64/80-docker.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/80-docker.sh
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/docker.sh
--- a/coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-install_protobuff.sh
@@ -35,37 +35,6 @@

 set -ex

-case ${BASH_SOURCE[0]} in
-    */macos/*) SERVER_PATH="${BASH_SOURCE[0]%/macos/*}/shared/testserver" ;;
-    */*) SERVER_PATH="${BASH_SOURCE[0]%/*}/../shared/testserver" ;;
-    *) SERVER_PATH="../shared/testserver" ;;
-esac
+# shellcheck source=../common/unix/install_protobuff.sh
+source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"

-# testserver shared scripts
-source "$SERVER_PATH/testserver_util.sh"
-
-# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support
-cpu_features=$(sysctl -a | grep machdep.cpu.features)
-case $cpu_features in
-    *VMX*) ;;
-    *) echo "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." >&2; exit 1 ;;
-esac
-
-# Create docker virtual machine (Boot2docker)
-source "$SERVER_PATH/docker_machine.sh"
-
-# Using SHA-1 of each server context as the tag of docker images. A tag labels a
-# specific image version. It is used by docker compose file (docker-compose.yml)
-# to launch the corresponding docker containers. If one of the server contexts
-# (./apache2, ./danted, ...) gets changes, all the related compose files in
-# qtbase should be updated as well.
-
-source "$SERVER_PATH/settings.sh"
-
-for server in $testserver
-do
-    context="$SERVER_PATH/$server"
-    docker build -t qt-test-server-$server:$(sha1tree $context) $context
-done
-
-docker images
--- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
@@ -114,14 +114,14 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
 { iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null

-iPhoneDeveloper="iosdevelopment.p12"
-shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
+iPhoneDeveloper="iosdevelopment_2019.p12"
+shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
 echo "Importing $iPhoneDeveloper.."
 { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null

-iPhoneDistribution="iosdistribution.p12"
-shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
+iPhoneDistribution="iosdistribution_2019.p12"
+shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
 echo "Importing $iPhoneDistribution.."
 { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
--- a/coin/provisioning/qtci-macos-10.13-x86_64/80-docker.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/80-docker.sh
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/docker.sh
--- a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1
--- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1
--- a/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-protobuf.ps1"
+
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	4c46984c46	Update submodules on '5.13' in qt5 Change-Id: I87f15314cf01a1b0482b1675c1eeaed380d92a3d Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-13 09:12:10 +00:00
Qt Submodule Update Bot	fc1d5bbe4c	Update submodules on '5.13' in qt5 Change-Id: I696da0adc9f8f11c08765662016972d4c47a8a04 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-11 05:16:35 +00:00
Qt Submodule Update Bot	9a5d221afc	Update submodules on '5.13' in qt5 Change-Id: I85f2cd016dc8c3e98e39ebee057d1d6bfc71d19b Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-08 12:09:53 +00:00
Qt Submodule Update Bot	a99977cf78	Update submodules on '5.13' in qt5 Change-Id: I20b6331abe3a914c5cf2503be61c34e2efe60016 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-05 06:41:28 +00:00
Qt Submodule Update Bot	bec94435f8	Update submodules on '5.13' in qt5 Change-Id: I798c8bc1278a02cdf9043ed50eade5ff66b6502d Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-02 21:38:04 +00:00
Heikki Halmet	abfc2cd571	Provisioning: Update emsdk version Task-number: QTBUG-73867 Change-Id: I4caab8d434787bf4323e1ea3232bf4bf23c1ec8d Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>	2019-03-02 06:29:52 +00:00
Qt Submodule Update Bot	e9d5fdaa20	Update submodules on '5.13' in qt5 Change-Id: I33af247c322de51b34dc65381be9e4e03261842d Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-27 16:46:26 +00:00
Liang Qi	2d0e6b81dd	Merge remote-tracking branch 'origin/5.12' into 5.13 Conflicts: coin/provisioning/common/windows/android-openssl.ps1 Change-Id: I0755066ece5458040a21b3da6ddbc1656240f5bb	2019-02-27 12:43:22 +01:00
Qt Submodule Update Bot	4e99a6976c	Update submodules on '5.13' in qt5 Change-Id: I7bf5a68c37be83ba2ad4e67ba24bcae7243297a0 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-26 09:31:40 +00:00
Heikki Halmet	d5c96aad5a	Provisioning: Remove docker from macOS provisioning When docker provisioning starting test-server in virtual box whole virtual machine will reboot. Let's remove docker until it's more stable or we know how to fix it. Task-number: QTQAINFRA-2801 Change-Id: Iad7437a69c954a90522e44ef27015518fa3f8c1e (cherry picked from commit 1865b99b527bd9eee80c39e95d47a44096e44e6a) Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>	2019-02-23 13:37:10 +00:00
Heikki Halmet	06fb909429	Provisioning: Change installation order for dotnet-framework Windows updates can't be disabled before dotnet-framework is enabled Task-number: QTQAINFRA-2824 Change-Id: I26c6b9d9aacfd8031a0b05ce48e003822aec3bdc Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-02-23 10:56:58 +00:00
Heikki Halmet	da2bd45ba6	Provisioning: Update mysql to Windows Currently this is the last version that support x86 for at least Windows. Task-number: QTQAINFRA-1996 Change-Id: Idd55694837afad2188697b4d5cc009a127ddb760 Reviewed-by: Andy Shaw <andy.shaw@qt.io>	2019-02-18 07:43:26 +00:00
Samuli Piippo	abbd43c943	Provisioning: update ARMv7 and ARM64 toolchains Update toolchains to Yocto Sumo release with GCC 7.3.0 Task-number: QTQAINFRA-2630 Change-Id: I078cfebde1df039a3783f76c37f914f0dda0483f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2019-02-18 07:41:18 +00:00
Qt Submodule Update Bot	1c6f272dd0	Update submodules on '5.12' in qt5 Change-Id: Ia2c669226e73a545a19c941c5672972a92049534 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-15 07:41:30 +00:00
Liang Qi	b0afdd4bc7	Update submodules on '5.13' in qt5 Change-Id: Ie526118f93295f56e0c2bf951c6fe8ab2b427eea Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-14 11:18:47 +00:00
Qt Submodule Update Bot	391ba3a9ca	Update submodules on '5.12' in qt5 Change-Id: Id119f941479fac5fa63c281ea21555ff99dc9a47 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-14 05:32:36 +00:00
Qt Submodule Update Bot	6967ec6b73	Update submodules on '5.12' in qt5 Change-Id: I75976d5f76dfac7cca5e13cf619a1d019b3bc5e3 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-13 05:39:18 +00:00
Juha Karjalainen	80deae9b74	Fix provisioning script dxsdk.ps1 Due to typo in dxsdk.ps1 provisioning script, it did not download from cached location. Also checksum Check was missing. Task-number: QTQAINFRA-2614 Change-Id: I321549721b256b85513fa1e4ff57ab1302e28f43 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2019-02-12 09:10:50 +00:00
Qt Submodule Update Bot	2dff8afa98	Update submodules on '5.12' in qt5 Change-Id: I758a05cd029f8252523681c19b657e76c7bb22dc Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-12 08:55:19 +00:00
Qt Submodule Update Bot	f64ba39ce5	Update submodules on '5.12' in qt5 Change-Id: I5a8f3943047e4b222795c08aeb6593b0225ada99 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-11 10:12:41 +00:00
Qt Submodule Update Bot	ef7908d90c	Update submodules on '5.12' in qt5 Change-Id: I7c99a0f95deb83a7aa81f68e1e1be2a7466b21d2 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-08 08:10:27 +00:00
Qt Submodule Update Bot	9df5188493	Update submodules on '5.12' in qt5 Change-Id: I609f70ead9f00039d3c89f9e26b1301bb18931c0 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-07 08:56:38 +00:00
Liang Qi	774f18e61a	Merge remote-tracking branch 'origin/5.12.1' into 5.12 Change-Id: I73b9cf3d1cdb2a9f2f88e5568f61447469f45313	2019-02-06 15:44:34 +01:00
Qt Submodule Update Bot	4f7c2120a7	Update submodules on '5.12' in qt5 Change-Id: Ia0b08ce2f5513e78cffa4679d7465a30c95de8e4 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-05 19:16:28 +00:00
Tony Sarajärvi	4987a682ff	Make qt3d-runtime.txt platform configuration a link The content of qt3d-runtime.txt should always be the same as qt5.txt. Change-Id: I6cdee575206332f6a719acfaacd7072a2178fd78 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-02-04 11:11:43 +00:00
Liang Qi	bee2b8cdb9	Update submodules on '5.12' in qt5 Change-Id: Ib8b55ed958660be457a7f0852fad9a13d853f1a5 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-04 09:53:02 +00:00
Heikki Halmet	3cb745565f	Provisioning: Renew iOS signing certificates Task-number: QTQAINFRA-2690 Change-Id: I4a058c7d88b3daa24f62d5bc314ec2b0ecc8c383 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-02-01 10:50:32 +00:00
Qt Submodule Update Bot	92498bad9c	Update submodules on '5.12' in qt5 Change-Id: I678bfdb4333abc34a29732aef1816d67f46c09cb Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-01 05:17:57 +00:00
Heikki Halmet	8ba5474da7	Provisioning: Install Google's Protocol Buffers Protobuf is needed for Automotive Suite Task-number: QTQAINFRA-2314 Change-Id: I12b4248f1de5aea88f573297a47b791b5b6296fb Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>	2019-01-29 12:10:57 +00:00
Heikki Halmet	54cdba9e3d	Provisioning: Remove Unneeded Android variables Change-Id: I7dd008aef6465fdddd07e227b48e9b6361c13f81 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-01-29 12:10:53 +00:00
Qt Submodule Update Bot	6d90dd2191	Update submodules on '5.12' in qt5 Change-Id: I4fbd3ab3ddb7509366797dde34678d9739229e8d Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-01-29 12:10:49 +00:00
Qt Submodule Update Bot	c45f3395ee	Update submodules on '5.12.1' in qt5 Change-Id: I31b89394b870ee1c20d3be5add7fed60e9b23d80 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-01-29 09:21:03 +00:00
Qt Submodule Update Bot	f5f03ebfcd	Update submodules on '5.12.1' in qt5 Change-Id: I3ad370f5f6312e22508a37f5618c979b60381987 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-01-26 07:21:10 +00:00
Qt Submodule Update Bot	1518bfdab6	Update submodules on '5.12' in qt5 Change-Id: I8060a5f51ae598fa7c8c348cfce212001250941d Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-01-25 20:09:57 +00:00
Oliver Wolff	92b7d48bc2	Windows provisioning: Explicitly state OpenGL configuration to use One of our configurations relied on ANGLE being the default OpenGL configuration on Windows. This is the case at the moment, but might change, so we should not rely on this behavior, but explicitly state the configuration we are expecting. Change-Id: Ie8cb215c2675faf8b514f4d9a43055638be1aaa8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>	2019-01-25 11:57:42 +00:00
Aapo Keskimolo	daf0d3a4c6	Update qtsaferenderer platform configuration definitions The project-specific platform configuration file is renamed to follow the convention as for other projects. This will allow Coin to recognize the configuration that are specific for qtsaferenderer project where they were previously (unintentionally) ignored. Removed QNX 7 as it is in the Qt mainline configuration. Removed Ubuntu 16.04 as Ubuntu 18.04 is now supported. Task-number: QSR-209 Change-Id: I505edc3741dbc047b2fc23bc409016d712596872 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-01-25 09:02:08 +00:00
Qt Submodule Update Bot	e8a1ca0581	Update submodules on '5.12' in qt5 Change-Id: I6403bd766964d9f65fadfbc514b01eeefdac540e Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-01-24 19:31:16 +00:00
Tuomas Heimonen	22f032bd02	Build qtsaferenderer examples in Windows Task-number: QSR-209 Change-Id: If8db177a77e3340f6b75f5a7fa768b6d8abec017 Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>	2019-01-23 13:31:36 +00:00
Qt Submodule Update Bot	017d9e2ee3	Update submodules on '5.12.1' in qt5 Change-Id: Idc5f439eb75011f6ec422f37050ced3fec879a6c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-01-22 04:14:04 +00:00
Qt Submodule Update Bot	3855853e34	Update submodules on '5.12.1' in qt5 Change-Id: I0e1da14b452ed6237831dca5459627f29621182e Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-01-14 06:45:22 +00:00
Qt Submodule Update Bot	da3ffbea17	Update submodules on '5.12.1' in qt5 Change-Id: Idf66e86252cea5b32bac9df3ebaa592936bc34d6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-01-11 11:31:00 +00:00
Qt Submodule Update Bot	616178cfb2	Update submodules on '5.12.1' in qt5 Change-Id: I8768b71048a5602b4a716b3a6da8b570f5e8e51a Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-01-10 05:13:22 +00:00
Qt Submodule Update Bot	5256ac9c60	Update submodules on '5.12.1' in qt5 Change-Id: I6bfbe10520706d6c93037585b1e78b8b85cd3ea1 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-01-09 05:22:17 +00:00
Liang Qi	0f8243bce8	Adjust submodule branches Change-Id: I581af0bcf61605f9cc9ee24dc9dc1c916b91abbd Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-01-09 05:22:13 +00:00
Liang Qi	6d4cb1849a	Merge remote-tracking branch 'origin/5.12' into 5.12.1 Change-Id: I53782263d173268fdfd3a3116c7fc6b596716992	2019-01-08 13:30:22 +01:00
Qt Submodule Update Bot	05c1f1cf99	Update submodules on '5.12.1' in qt5 Change-Id: I1e2e226840416c8ae0166950dd62a3180dd52ee1 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-01-01 19:34:46 +00:00
				`@@ -0,0 +1,2 @@`
				`. "$PSScriptRoot\..\common\windows\install-protobuf.ps1"`