Update submodules on '5.12.3' in qt5

Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2026-01-10 00:46:41 +08:00 · 2019-04-11 03:06:13 +00:00 · 2019-04-05 11:29:29 +00:00 · 2019-03-30 20:26:00 +00:00 · 2019-03-25 10:07:35 +02:00 · 2019-03-23 08:32:42 +00:00
73 changed files with 432 additions and 133 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,60 +1,60 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.12
+	branch = 5.12.3
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.12
+	branch = 5.12.3
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.12
+	branch = 5.12.3
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.12
+	branch = 5.12.3
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.12
+	branch = 5.12.3
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.12
+	branch = 5.12.3
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -62,7 +62,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.12
+	branch = 5.12.3
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -123,185 +123,185 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.12
+	branch = 5.12.3
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.12
+	branch = 5.12.3
 	status = addon
--- a/8
+++ b/8
@@ -13,9 +13,10 @@ BasedOnStyle: WebKit

 Standard: Cpp11

-# Leave the line breaks up to the user.
+# Column width is limited to 100 in accordance with Qt Coding Style.
+# https://wiki.qt.io/Qt_Coding_Style
 # Note that this may be changed at some point in the future.
-ColumnLimit: 0
+ColumnLimit: 100
 # How much weight do extra characters after the line length limit have.
 # PenaltyExcessCharacter: 4

@@ -77,4 +78,5 @@ SortIncludes: false
 # macros for which the opening brace stays attached.
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]

-
+# Break constructor initializers before the colon and after the commas.
+BreakConstructorInitializers: BeforeColon
--- 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
@@ -8,9 +8,9 @@ qtci-windows-10-x86_64-10                                   Mingw73
 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-windows-10-x86_64-10   Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10   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
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,7 +1,6 @@
 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
--- 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.16"
 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="353ad7bf614f73b73ed1d05aedd66321d679e03d"
+sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673"
 sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
 targetFolder="/opt/emsdk"
 sudo mkdir "$targetFolder"
--- a/coin/provisioning/common/macos/install_openssl.sh
+++ b/coin/provisioning/common/macos/install_openssl.sh
@@ -73,8 +73,8 @@ SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\""
 SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
 SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""

-security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
-security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
+security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
+security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null

 sudo rm -rf /tmp/openssl-$opensslVersion

--- a/coin/provisioning/common/unix/install-breakpad.sh
+++ b/coin/provisioning/common/unix/install-breakpad.sh
@@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad"
    )


-SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src"
+SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"

 echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
 echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt
--- 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/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -38,9 +38,9 @@ set -ex
 # This script will install squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)

-version="6.3.2"
+version="6.4.3"
 # Branch version without dot
-qtBranch="510x"
+qtBranch="512x"
 squishFolder="/opt/squish"
 squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
 squishFile="squish-$version-qt$qtBranch-linux64.run"
--- 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/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -159,3 +159,22 @@ function IsProxyEnabled {
 function Get-Proxy {
    return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
 }
+
+function Remove {
+
+    Param (
+        [string]$Path = $(BadParam("a path"))
+    )
+    Write-Host "Removing $Path"
+    $i = 0
+    While ( Test-Path($Path) ){
+        Try{
+            remove-item -Force -Recurse -Path $Path -ErrorAction Stop
+        }catch{
+            $i +=1
+            if ($i -eq 5) {exit 1}
+            Write-Verbose "$Path locked, trying again in 5"
+            Start-Sleep -seconds 5
+        }
+    }
+}
--- a/coin/provisioning/common/windows/install-breakpad.ps1
+++ b/coin/provisioning/common/windows/install-breakpad.ps1
@@ -87,7 +87,7 @@ catch {
    git checkout $linux_syscall_support_commit_sha1
 }

-Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src"
+Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"

 # Write HEAD commit sha to versions txt, so build can be repeated at later date
 Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt
--- a/coin/provisioning/common/windows/install-gnuwin32.ps1
+++ b/coin/provisioning/common/windows/install-gnuwin32.ps1
@@ -0,0 +1,46 @@
+############################################################################
+##
+## 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 gnuwin32
+
+$prog = "gnuwin32"
+$zipPackage = "$prog.zip"
+$temp = "$env:tmp"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
+$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
+Download $externalUrl $internalUrl "$temp\$zipPackage"
+Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
+Extract-7Zip "$temp\$zipPackage" C:\Utils
+
+Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\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/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -38,18 +38,18 @@
 # NOTE! Make sure 64bit versions are always installed before 32bit,
 # because they use same folder name before a rename

-$version = "6.3.2"
+$version = "6.4.3"

 # Qt branch without dot (*.*)
-$qtBranch = "510x"
-# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point
+$qtBranch = "512x"
+# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point
 # the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.

 $targetDir = "C:\Utils\squish"
 $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
 $squishBranchUrl = "$squishUrl\$qtBranch"
 $testSuite = "suite_test_squish"
-$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z"
+$testSuiteUrl = "$squishUrl\$testSuite.7z"

 # Squish license
 $licensePackage = ".squish-3-license"
@@ -62,7 +62,10 @@ Function DownloadAndInstallSquish {
        [string]$bit,
        [string]$squishPackage
    )
-
+    # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13
+    if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) {
+        $qtBranch = "511x"
+    }
    $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe"
    $SquishInstaller = "$targetDir\$squishPackage.exe"
    $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage"
@@ -125,25 +128,27 @@ DownloadSquishLicence $squishUrl
 if ($OSVersion -eq "Windows 10 Enterprise") {

    if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 msvc14
+        DownloadAndInstallSquish $version win64 "msvc14"
+        DownloadAndInstallSquish $version win64 "msvc141"
+        DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh"
+    } else {
+        DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
    }
-    DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
-    DownloadAndInstallSquish $version win32 "msvc14"
+    DownloadAndInstallSquish $version win32 "msvc141"

 } elseif ($OSVersion -eq "Windows 8.1 Enterprise") {

    if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 "msvc12"
        DownloadAndInstallSquish $version win64 "msvc14"
    }
-    DownloadAndInstallSquish $version win32 "msvc14"
+    DownloadAndInstallSquish $version win32 "msvc141"

 } elseif ($OSVersion -eq "Windows 7 Enterprise") {

    if (Is64BitWinHost) {
-        DownloadAndInstallSquish $version win64 "msvc12"
        DownloadAndInstallSquish $version win64 "msvc14"
+    } else {
+        DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
    }
-    DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
-    DownloadAndInstallSquish $version win32 "msvc14"
+    DownloadAndInstallSquish $version win32 "msvc141"
 }
--- a/coin/provisioning/common/windows/vc_redist.ps1
+++ b/coin/provisioning/common/windows/vc_redist.ps1
@@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
 Write-Host "Installing $package..."
 Run-Executable $package "/q"
-Write-Host "Remove $package..."
-Remove-Item -Force -Path $package
+Remove $package
--- 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
@@ -0,0 +1,40 @@
+#!/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$
+##
+#############################################################################
+
+set -ex
+
+# shellcheck source=../common/unix/install_protobuff.sh
+source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.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
@@ -0,0 +1,40 @@
+#!/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$
+##
+#############################################################################
+
+set -ex
+
+# shellcheck source=../common/unix/install_protobuff.sh
+source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"
+
--- 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-windows-10-x86/09-install-dependencywalker.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
--- a/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
--- a/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.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/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
--- a/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1
+++ b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
--- a/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
--- a/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.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
--- 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	8337e20fad	Update submodules on '5.12.3' in qt5 Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-04-11 03:06:13 +00:00
Qt Submodule Update Bot	7ff76b89dd	Update submodules on '5.12.3' in qt5 Change-Id: I216b93959076bc9402c715599398dea770cacde2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-04-05 11:29:29 +00:00
Qt Submodule Update Bot	d0d7ade759	Update submodules on '5.12.3' in qt5 Change-Id: I34e1bd8f276b6e9eb2a1f658f2447fdd01fd4d09 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-30 20:26:00 +00:00
Kari Oikarinen	84aaf6871c	Adjust submodule branches Change-Id: I28500be5d253a4d047cef1409659c275c314d5b0	2019-03-25 10:07:35 +02:00
Qt Submodule Update Bot	b02d849d76	Update submodules on '5.12' in qt5 Change-Id: I944abf1de570b68229ba2284e93e879aadc21b2d Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-23 08:32:42 +00:00
Tony Sarajärvi	665703efc9	Remove 32bit MSVC 2015 from the CI Task-number: QTQAINFRA-2251 Change-Id: I4006c7390759e2eb357309de36eb23af007a576e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>	2019-03-23 08:32:35 +00:00
Juha Karjalainen	a97d669a20	Provisioning: Remove certificate printing to log macOS openssl provisioning printed certificates to log. This patch prevent printing certificates to log by redirecting it to /dev/null Task-number: QTQAINFRA-2841 Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>	2019-03-22 12:06:56 +00:00
Qt Submodule Update Bot	7cc57995bf	Update submodules on '5.12' in qt5 Change-Id: Idba1b3637a56b7bf822c6a0bff29dd91dca735b7 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-22 08:56:29 +00:00
Qt Submodule Update Bot	209b8117bd	Update submodules on '5.12' in qt5 Change-Id: I5cd2a0098c21f4d4691261fd5c2c1f535f119a77 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-21 18:29:30 +00:00
Liang Qi	78afd2d4b6	Merge remote-tracking branch 'origin/5.12.2' into 5.12 Change-Id: I8795e84dd750cbb2b55a03c861b911f57a1e2626	2019-03-21 14:26:56 +01:00
Qt Submodule Update Bot	323dcdb60f	Update submodules on '5.12' in qt5 Change-Id: If57974194302222651f94a7e7b99cc4e34c3b3a1 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-20 15:31:56 +00:00
Johanna Äijälä	c71f004171	Provisioning: add dependency walker to win10 x86 Needed by RTA. Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2019-03-20 13:23:34 +00:00
Heikki Halmet	0660a25cca	Provisioning: Make gnuwin32 available for windows machines This script will install gnuwin32 to the windows machines so it can be removed from qt5 Task-number: QTBUG-73422 Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199 Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-03-17 08:16:25 +00:00
Johanna Äijälä	675deb1474	Add Squish for MSVC2017 x64 to Win10 x64 machines Also Squish for MinGW x86 on Win7 x86. Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2019-03-14 05:27:53 +00:00
Paul Wicking	cc1203311a	Update comment in clang-format file Change-Id: I18f14a1956f508317f8a3995873a14bc1af29594 Reviewed-by: Andy Maloney <asmaloney@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>	2019-03-11 10:33:26 +00:00
Qt Submodule Update Bot	f9c5acb2ff	Update submodules on '5.12' in qt5 Change-Id: I4f983c014f06d1d396b13fde8e58d473bf5c988a Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-11 06:19:46 +00:00
Heikki Halmet	76c80866af	Provisioning: Help script for removing items Sometimes items are locked (access denied) so we need to have function which waits and retry until removing is possible. Task-number: QTQAINFRA-2806 Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>	2019-03-10 14:32:03 +00:00
Qt Submodule Update Bot	afa1b053fe	Update submodules on '5.12' in qt5 Change-Id: I324c45e79a1719943cdd8544a3ddbefc9394421c Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-08 21:38:55 +00:00
Paul Wicking	e403403b39	Update clang-format config Set column width to 100 as described in the official Qt coding style (https://wiki.qt.io/Qt_Coding_Style). Also, break constructor initializers before the colon and after the commas. Change-Id: I6ac5a21ce831a35a0d74e699192ba981c8a8ba3c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>	2019-03-08 13:53:33 +00:00
Qt Submodule Update Bot	ec772e3e4a	Update submodules on '5.12' in qt5 Change-Id: Ie5d3cf0419efe268c3268fd4e5038c61677e57ea Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-08 08:50:13 +00:00
Qt Submodule Update Bot	7100c54887	Update submodules on '5.12.2' in qt5 Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c Reviewed-by: Antti Kokko <antti.kokko@qt.io>	2019-03-08 04:47:08 +00:00
Johanna Aijala	88b35a4921	Update Squish to 6.4.3 Froglogic has not yet released Squish for Qt5.13 but we can use Squish packages build with Qt5.12. Remove msvc12 Squish, not needed. Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2019-03-07 06:18:26 +00:00
Qt Submodule Update Bot	cfea5af0ed	Update submodules on '5.12' in qt5 Change-Id: I99b557104856e3cbf7375f56e7f42b77430bf49f Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-05 06:41:22 +00:00
Qt Submodule Update Bot	b74bc40b41	Update submodules on '5.12' in qt5 Change-Id: I31fc2036208413ee138e6154f65af60e15f0e00c Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-02 21:37:30 +00:00
Liang Qi	4df2866684	Update submodules on '5.12' in qt5 Change-Id: I20eba8a90e0683263245a01eac5a553c78961050 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-01 19:05:44 +00:00
Qt Submodule Update Bot	3a1e557e54	Update submodules on '5.12.2' in qt5 Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-02-28 19:08:08 +00:00
Antti Kokko	091820f6a1	Remove qt3d-runtime.txt symbolic link from platform configurations Caused recursion in CI platform configuration parsing algorithm. Add qt3d-runtime.txt back as regular file. Task-number: QTQAINFRA-2804 Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-02-28 04:08:21 +00:00
Qt Submodule Update Bot	ffe8fd7701	Update submodules on '5.12.2' in qt5 Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-02-27 19:35:15 +00:00
Heikki Halmet	099b7ffe4c	Provisioning: Update emsdk version Task-number: QTBUG-73867 Change-Id: I2aabbecbce2fc3378db6c0747fc8146c03fac545 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>	2019-02-26 11:11:15 +00:00
Qt Submodule Update Bot	becac559b7	Update submodules on '5.12.2' in qt5 Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-23 06:47:32 +00:00
Qt Submodule Update Bot	83d5226604	Update submodules on '5.12.2' in qt5 Change-Id: I131875e52b21ab1c354955cf82427470094da8ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-02-21 19:06:48 +00:00
Juha Karjalainen	9c60d8b190	Fix: Set correct path to environmental variable Env variable BREAKPAD_SOURCE_DIR had /src at end which was not needed. Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>	2019-02-18 13:17:52 +00:00
Qt Submodule Update Bot	b3b6b100e6	Update submodules on '5.12.2' in qt5 Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-02-16 06:50:30 +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
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
Kari Oikarinen	d5d380f452	Adjust submodule branches Change-Id: I309db20815d3b383155e6549b649607e956b8d89	2019-02-13 09:25:22 +02: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 @@`
				`. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"`
				`@@ -0,0 +1,2 @@`
				`. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"`