Update submodules on '5.11' in qt5

Change-Id: Ie59c702af192cf03bb5c865345625f61feb83887 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Fix msvc_2015_update3_patch
2026-01-14 02:46:46 +08:00 · 2018-04-07 08:26:59 +00:00 · 2018-04-06 19:41:22 +00:00 · 2018-04-06 19:41:19 +00:00 · 2018-04-06 19:41:16 +00:00 · 2018-04-06 11:02:51 +00:00
19 changed files with 17 additions and 19 deletions
--- a/coin/platform_configs/tqtc-qt-rta.txt
+++ b/coin/platform_configs/tqtc-qt-rta.txt
@@ -2,5 +2,5 @@ Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-7-x86_64-4                                     MSVC2013    Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-8.1-x86_64                                     MSVC2013    Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-10-x86-2                                       MSVC2017    Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86-3                                       MSVC2017    Release ForceDebugInfo OpenGLDynamic

--- a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1
@@ -47,7 +47,6 @@ if (Test-Path $preparedPackage) {
    # The prepared package contains updated packages so that not everything has to be downloaded
    Write-Host "Using prepared package"
    Copy-Item -Recurse $preparedPackage $packagePath
-    exit 0
    # Remove the whole downloaded folder
    $toRemove = $packagePath + "\vs14-kb3165756-update"
    $executable = "$toRemove\vs14-kb3165756.exe"
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
@@ -90,7 +90,6 @@ installPackages+=(libxslt-devel)
 # For building Wayland from source
 installPackages+=(libffi-devel)

-sudo yum -y update
 sudo yum -y install "${installPackages[@]}"

 # Make python 2.7 and its pip default
--- 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	7f6fd7621b	Update submodules on '5.11' in qt5 Change-Id: Ie59c702af192cf03bb5c865345625f61feb83887 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2018-04-07 08:26:59 +00:00
Oliver Wolff	0029642f18	Fix msvc_2015_update3_patch Change-Id: Ie008b274c2f27d9792340dd4f6c2d3215bd376ca Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>	2018-04-06 19:41:22 +00:00
Tony Sarajärvi	daeaec9b3c	Remove updating of RHEL 7.4 system during each provisioning Yum update doesn't only fetch the repository data. It also runs a distro upgrade. So if something gets updated that isn't compatible with us, it breaks. It also slows down the provisioning a lot. Change-Id: I27136bc572fbce5410b82ff9574cf85bf89e3100 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2018-04-06 19:41:19 +00:00
Qt Submodule Update Bot	9fdc8fe5e9	Update submodules on '5.11' in qt5 Change-Id: Ic767892fd0ed815d1cec35eced62e83b1ac4e029 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-04-06 19:41:16 +00:00
Joni Jantti	9af755a79e	Add VC build tools to Windows 10 x86 template These tools were missing from the installation. Change-Id: I627b28a6f9373df708952e22a7f404b8dbce6239 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2018-04-06 11:02:51 +00:00