Update submodules on '5.13' in qt5

Change-Id: I240eb1ed9c19588a40f27ca35759fc23320c235b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Provisioning: Remove MSVC 2015 update 3 patch from provisioning
2026-03-08 13:26:14 +08:00 · 2019-04-10 10:43:51 +00:00 · 2019-04-09 09:17:20 +00:00 · 2019-04-08 06:28:02 +00:00 · 2019-04-05 05:04:34 +00:00 · 2019-04-05 05:04:27 +00:00
85 changed files with 388 additions and 339 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,7 +49,7 @@
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
 	branch = 5.13
-	status = addon
+	status = deprecated
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
--- 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,12 +1,12 @@
 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-14                                           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
-qtci-windows-10-x86_64-10           WinRT_10            x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10           WinRT_10            armv7       MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                                           MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-14                               x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-14                                           MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-14           WinRT_10            x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-14           WinRT_10            armv7       MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-14                                           MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         NoWidgets ForceDebugInfo
 qtci-linux-Ubuntu-18.04-x86_64                                      GCC                         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
 qtci-linux-openSUSE-15.0-x86_64                                     GCC                         DeveloperBuild NoPch
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -1,22 +1,22 @@
 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-10-x86_64-14   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-14                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-14   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-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-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-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
 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-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
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,22 +1,22 @@
 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-10-x86_64-14   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-14                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-14   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-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-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-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
 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-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
--- a/coin/platform_configs/qtbase.txt
+++ b/coin/platform_configs/qtbase.txt
@@ -2,6 +2,5 @@ Template                          Target OS           Target arch Compiler    Fe
 --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-linux-Ubuntu-18.04-x86_64    QEMU                armv7       GCC         DeveloperBuild DisableTests
 qtci-linux-Ubuntu-18.04-x86_64    QEMU                arm64       GCC         DeveloperBuild DisableTests
-qtci-windows-10-x86_64-10         WinRT_10            x86_64      MSVC2015    DeveloperBuild Static Release ForceDebugInfo
+qtci-windows-10-x86_64-14         WinRT_10            x86_64      MSVC2015    DeveloperBuild Static Release ForceDebugInfo
 qtci-linux-openSUSE-15.0-x86_64   WebAssembly                     GCC         DeveloperBuild NoPch DisableTests
-
--- a/coin/platform_configs/qtconnectivity.txt
+++ b/coin/platform_configs/qtconnectivity.txt
@@ -1,3 +1,3 @@
 Template                          Target OS           Target arch Compiler    Features
 --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10         WinRT_10            x86_64      MSVC2015    DeveloperBuild Static Release ForceDebugInfo
+qtci-windows-10-x86_64-14         WinRT_10            x86_64      MSVC2015    DeveloperBuild Static Release ForceDebugInfo
--- 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/qtwebkit.txt
+++ b/coin/platform_configs/qtwebkit.txt
@@ -1,4 +1,4 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-14                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-7-x86-3                                        Mingw73     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
--- 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/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
@@ -1,48 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
-
-# This script will install Visual Studio 2017 Build Tools
-# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
-
-$version = "2017_version_15.0"
-$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
-$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
-$msvcPackage = "C:\Windows\Temp\$version.exe"
-
-Download $url_cache $url_cache $msvcPackage
-Verify-Checksum $msvcPackage $sha1
-cmd /c "$msvcPackage --all --passive --wait"
-echo "Cleaning $msvcPackage.."
-Remove-Item -Recurse -Force "$msvcPackage"
-echo "Visual Studio Build Tools = $version" >> ~\versions.txt
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
@@ -30,29 +30,22 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"

-# Install Visual Studio $version with $update_version
-# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
-$version = "2015"
-$update_version = "3"
+# Visual Studio $version was installed manually using $installer.
+$version = "2015 update 3"
+$version_number ="14.0.25431.01"
+$installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978"

-# Only way to install specific Visual studio release is to use feed.xml.
-# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx'
-# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates)
-$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml"
+# default plus following components were selected:
+# * Visual C++
+# * Universal Windows App Development Tools
+#   - Tools (1.4.1) and Windows SDK (10.0.14393)
+#   - Windows 10 SDK (10.0.10586)
+#   - Windows 10 SDK (10.0.10240)
+# * Common Tools
+#   -Visual Studio Extensibility Tools Update 3

-$msvc_web_installer = "vs" + $version + "_" + $update_version
-$package = "C:\Windows\temp\$msvc_web_installer.exe"
-$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe"
-$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
-$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"
+# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
+$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"

-echo "Fetching Visual Studio $version update $update_version..."
-Download $url_official $url_cache $package
-Verify-Checksum $package $sha1
-echo "Installing Visual studio $version update $update_version..."
-cmd /c "$package $parameters /norestart /Quiet"
-remove-item $package
-
-echo "Visual Studio = $version update $update_version" >> ~\versions.txt
+echo "Visual Studio = $version version $version_number" >> ~\versions.txt
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
@@ -31,19 +31,57 @@
 ##
 #############################################################################

-. "$PSScriptRoot\..\common\helpers.ps1"
-
-# This script will install Visual Studio 2017
+# Visual Studio $version version $version_number was installed manually using $installer.

 $version = "2017"
-$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
-$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
-$msvcPackage = "C:\Windows\Temp\$version.exe"
+$version_number = "15.8.5"
+$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe"

+# Following components were selected from installer:
+# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack)
+# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK)
+# Microsoft.Component.NetFX.Native (.NET Native)
+# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack)
+# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server)
+# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references)
+# Microsoft.Component.ClickOnce (ClickOnce Publishing)
+# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools)
+# Microsoft.VisualStudio.Component.NuGet (NuGet package manager)
+# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools)
+# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation)
+# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers)
+# Microsoft.Component.MSBuild (MSBuild)
+# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.8 v14.15 latest v141 tools)
+# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update)
+# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM)
+# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64)
+# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake)
+# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools)
+# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools)
+# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics)
+# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger)
+# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic)
+# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support)
+# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services)
+# Component.Linux.CMake (Visual C++ tools for CMake and Linux)
+# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features)
+# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX)
+# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors)
+# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK)
+# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK)
+# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK)
+# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64)
+# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0))
+# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0))
+# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0))
+# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64])
+# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS)
+# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++)
+# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64])
+# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS)
+# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++)
+# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64])
+# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0))
+# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0))

-Download $url_cache $url_cache $msvcPackage
-Verify-Checksum $msvcPackage $sha1
-cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
-echo "Cleaning $msvcPackage.."
-Remove-Item -Recurse -Force "$msvcPackage"
-echo "Visual Studio = $version" >> ~\versions.txt
+echo "Visual Studio = $version version version_number" >> ~\versions.txt
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"

 toolsVersion="r26.1.1"
 toolsFile="sdk-tools-linux-4333796.zip"
-ndkVersion="r18b"
+ndkVersion="r19c"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
 sdkBuildToolsVersion="28.0.3"
 sdkApiLevel="android-28"

 toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
-ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b"
+ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
--- 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/macos/docker_testserver.sh
+++ b/coin/provisioning/common/macos/docker_testserver.sh
@@ -1,71 +0,0 @@
-#!/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
-
-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
-
-# 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/common/unix/install_protobuff.sh
+++ b/coin/provisioning/common/unix/install_protobuff.sh
@@ -33,31 +33,43 @@
 ##
 #############################################################################

-set -ex
+# shellcheck source=./DownloadURL.sh
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+# shellcheck source=./SetEnvVar.sh
+source "${BASH_SOURCE%/*}/SetEnvVar.sh"

-# 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"
+# This script will install Google's Protocal Buffers which is needed by Automotive Suite

-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
+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"

-    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
+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
-sudo installer -pkg $target_file -target /

-# Start testserver provisioning
-source "${BASH_SOURCE%/*}/docker_testserver.sh"
+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/android.ps1
+++ b/coin/provisioning/common/windows/android.ps1
@@ -40,10 +40,10 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.

 # NDK
-$ndkVersion = "r18b"
-$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
-$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
-$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803"
+$ndkVersion = "r19c"
+$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip"
+$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip"
+$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3"
 $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
 $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"

@@ -98,7 +98,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8
 cd $toolsFolder\bin\
 $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion"
 $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args'
-iex $command
+Invoke-Expression $command
 $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
 iex $command
 cmd /c "dir C:\Utils\android"
--- a/coin/provisioning/common/windows/disable-defragment.ps1
+++ b/coin/provisioning/common/windows/disable-defragment.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2018 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.
@@ -31,4 +31,42 @@
 ##
 #############################################################################

-schtasks /Delete /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /F
+# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
+# thus needing its own version.
+Write-Host "Disabling defragmentation"
+$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption
+if ($version -like '*Windows 7*'){
+    $pi = New-Object System.Diagnostics.ProcessStartInfo
+    $pi.FileName = "C:\Windows\System32\schtasks.exe"
+    $pi.RedirectStandardError = $true
+    $pi.UseShellExecute  = $false
+    $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F"
+    $prog = New-Object System.Diagnostics.Process
+    $prog.StartInfo = $pi
+    $prog.Start() | Out-Null
+    $err = $prog.StandardError.ReadToEnd()
+    $prog.WaitForExit()
+    if ($prog.ExitCode -eq 0){
+        Write-Host "Scheduled defragmentation removed"
+    } else {
+        if ($err -like '*cannot find the file*'){
+            Write-Host "No scheduled defragmentation task found"
+            exit 0
+        } else {
+            Write-Host "Error while deleting scheduled defragmentation task: $err"
+        }
+    }
+}
+else {
+    try {
+        $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State
+        Write-Host "Scheduled defragmentation task found in state: $state"
+    }
+    catch {
+        Write-Host "No scheduled defragmentation task found"
+        exit 0
+    }
+    Write-Host "Unregistering scheduled defragmentation task"
+    Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag
+    Write-Host "Scheduled Defragmentation task was cancelled"
+}
--- 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-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/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
@@ -1,6 +1,8 @@
+#!/usr/bin/env bash
+
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
@@ -30,5 +32,9 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
+
+set -ex
+
+# shellcheck source=../common/unix/install_protobuff.sh
+source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.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/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
@@ -51,14 +51,14 @@ toolsVersion="r26.1.1"
 # toolsFile dertermines tools version
 toolsFile="sdk-tools-darwin-4333796.zip"

-ndkVersion="r18b"
+ndkVersion="r19c"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
 sdkBuildToolsVersion="28.0.3"
 # this is compile sdk version
 sdkApiLevel="android-28"

 toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
-ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440"
+ndkSha1="f46b8193109bba8a58e0461c1a48f4534051fb25"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
--- a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
@@ -1,6 +1,8 @@
+#!/usr/bin/env bash
+
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## 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.
@@ -30,5 +32,9 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
+
+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-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-remove-ms-zune.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1
@@ -1,2 +0,0 @@
-Remove-AppxPackage Microsoft.ZuneVideo_10.17092.13511.0_x64__8wekyb3d8bbwe
-Remove-AppxPackage Microsoft.ZuneMusic_10.17083.18321.0_x64__8wekyb3d8bbwe
--- 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/05-msvc.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1
@@ -34,10 +34,10 @@
 # Visual Studios are pre-provisioned to tier1 images

 # MSVC 2015 Update 3
-Write-Output "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt
+Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt

 # MSVC 2017
-Write-Output "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt
+Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt

 # MSVC 2017 Build Tools
 Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt
--- 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
--- 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	314db90904	Update submodules on '5.13' in qt5 Change-Id: I240eb1ed9c19588a40f27ca35759fc23320c235b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2019-04-10 10:43:51 +00:00
Heikki Halmet	b3e35cbac5	Provisioning: Remove MSVC 2015 update 3 patch from provisioning MSVC 2015 update 3 patch seems to be already pre-provisioned with MSVC 2015 update installation Task-number: QTQAINFRA-2899 Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-04-09 09:17:20 +00:00
Alex Blasche	16201ab31d	Deprecate QtXmlPattern module Change-Id: Iec4561cd6ae38b8133d4f0ddaf5ed0ecb03d4304 Reviewed-by: Lars Knoll <lars.knoll@qt.io>	2019-04-08 06:28:02 +00:00
Heikki Halmet	c654e63c87	Update Windows 10, MSVC 2015 and MSVC 2017 Windows 10 updated to build 1809 msvc2015 update 3 14.0.25431.01 msvc2015 update 3 (KB3165756) msvc2017 5.18.2 4.7.03056 ms-zune is no longer available in the latest Windows 10 version dotnet and msvc 2015 update patch installation moved to pre-provisioning. Msvc 2015 update patch installation seems to be flaky with this windows version. Task-number: QTBUG-68190 Task-number: QTQAINFRA-2255 Task-number: QTBUG-71125 Change-Id: I87defffa488cb75f7de0909020073b35476bea80 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-04-05 05:04:34 +00:00
Liang Qi	8630f18d1e	Only update qtwebengine in this round Change-Id: Ic8a307e2a3dd774adf6484894531b9a177bec58f Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-04-05 05:04:27 +00:00
Heikki Halmet	c09135cb56	Provisioning: Update Android NDK to version r19 Also let's start using 64-bit Android NDK for Windows Task-number: QTQAINFRA-2568 Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-04-01 11:42:49 +00:00
Qt Submodule Update Bot	7eeee0df43	Update submodules on '5.13' in qt5 Change-Id: I81587903b3fdf6d68c3e91d0c6d21c591e2746a3 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-29 21:05:29 +00:00
Qt Submodule Update Bot	eb3c52455c	Update submodules on '5.13' in qt5 Change-Id: I2a21f0c7eabe7697691bbe330fd0c74058997bb1 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-23 08:32:55 +00:00
Qt Submodule Update Bot	3003529631	Update submodules on '5.13' in qt5 Change-Id: I0c15efb52ebac506133653336a16d09174bb938f Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-21 19:49:57 +00:00
Qt Submodule Update Bot	7158816eed	Update submodules on '5.13' in qt5 Change-Id: I9b5cfc02f045711d84084dd52e3add7baa3a0722 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-17 19:56:39 +00:00
Juha Karjalainen	48ab1d879b	Fix provisioning disable defragmentation for windows If no scheduled task exist it would throw error causing provisioning to fail. Now catch when scheduling does not exist. Task-number: QTQAINFRA-2823 Change-Id: I3bf24df6116b6c978171950bf5bf954f5ddee533 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2019-03-15 09:13:16 +00:00
Qt Submodule Update Bot	deecc97dc2	Update submodules on '5.13' in qt5 Change-Id: Ibd880c74a5842a88d8ee0a8cb1eaf3487b4f7192 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-14 17:00:45 +00:00
Liang Qi	bbce3228af	Merge remote-tracking branch 'origin/5.12' into 5.13 Conflicts: coin/provisioning/common/linux/emsdk.sh Change-Id: I9ba6a1c52b70b605f0f856b6ce6912fd499792a3	2019-03-14 12:10:15 +01: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
Qt Submodule Update Bot	0545584315	Update submodules on '5.13' in qt5 Change-Id: I8c823bab00e24f89a748986bf3eacf12d8de1d46 Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-03-13 20:33:23 +00:00
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
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
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
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	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	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
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	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	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	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
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
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
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	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
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	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"`