From 713ed0c9b8805336a52ccf44c64148ddb411711d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 16 Sep 2018 20:42:00 +0200 Subject: [PATCH 01/14] Update submodules on '5.12' in qt5 Change-Id: Ib09d0026a9427134822303cd05e7f696a5d15a28 Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 5728a9d8..232fe3ab 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5728a9d8a7f8b64099cf369d9d307a00b5fce29c +Subproject commit 232fe3ab6a2eb0585c77c0aee4769493ba23c35a From 00958e9430e5ca739ac37bd19fc9deb407afb228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 18 Sep 2018 14:39:11 +0300 Subject: [PATCH 02/14] Move packaging from macOS 10.12 to macos 10.13 Task-number: QTQAINFRA-2056 Change-Id: I04b0a282beedce15959b416d716b63bd6197b4a3 Reviewed-by: Liang Qi --- coin/platform_configs/default.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b0e9e210..07043f46 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -13,8 +13,8 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo -qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release -qtci-macos-10.13-x86_64 Clang DebugAndRelease Release +qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release +qtci-macos-10.13-x86_64 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-8 Clang DeveloperBuild Release QtNamespace NoPch qtci-macos-10.12-x86_64-8 Clang Release NoFramework DisableTests qtci-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static From f1256e1f391fb9b229a246baff17f2562a82df20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 6 Aug 2018 09:09:34 +0300 Subject: [PATCH 03/14] Switch MinGW to clang in Windows Android builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also as target_compiler is a column now, let's add the missing information about android target compiler in the rest of the configurations as well. Task-number: QTQAINFRA-1682 Change-Id: I6de1ea40383512f5fb8b55242f1a1ac264f9d7d6 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 56 +++++++++++++++---------------- coin/platform_configs/qt5.txt | 40 +++++++++++----------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 07043f46..5615d770 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,28 +1,28 @@ -Template Target OS Target arch Compiler Features ------------------------------------ ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples -qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2015 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-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples -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-42.3-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo -qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release -qtci-macos-10.13-x86_64 Clang Packaging DebugAndRelease Release -qtci-macos-10.12-x86_64-8 Clang DeveloperBuild Release QtNamespace NoPch -qtci-macos-10.12-x86_64-8 Clang Release NoFramework DisableTests -qtci-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests -qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release -qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +Template Target OS Target arch Compiler Target Compiler Features +----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples +qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic +qtci-windows-10-x86_64-10 x86 MSVC2015 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-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples +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-42.3-x86_64 GCC DeveloperBuild NoPch +qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite +qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo +qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release +qtci-macos-10.13-x86_64 Clang Packaging DebugAndRelease Release +qtci-macos-10.12-x86_64-8 Clang DeveloperBuild Release QtNamespace NoPch +qtci-macos-10.12-x86_64-8 Clang Release NoFramework DisableTests +qtci-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests +qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests +qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release +qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck +qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 1b09c7d6..984844be 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,20 +1,20 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64 Android_ANY x86 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +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 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From a620807118a2d4566fbb04b5d90b85f8f0a41a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 18 Sep 2018 14:40:35 +0300 Subject: [PATCH 04/14] Move QNX770 from macOS 10.12 to macOS 10.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I02f0fff983349dd59f2697a050b97b761d04d3b5 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qt5.txt | 2 +- .../qtci-macos-10.12-x86_64/40-qnx700.sh | 57 ------------------- 2 files changed, 1 insertion(+), 58 deletions(-) delete mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 984844be..f074aea7 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -12,7 +12,7 @@ qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-macos-10.13-x86_64 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 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh deleted file mode 100755 index 38fb6103..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## 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$ -## -############################################################################# - -# This script installs QNX 7. - -targetFolder="/opt/" -sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20180801-macos.zip" -folderName="qnx700" - -sudo mkdir -p "$targetFolder" - -echo "Extracting QNX 7" -sudo unzip -q "$sourceFile" -d "$targetFolder" - -sudo chown -R qt:wheel "$targetFolder"/"$folderName" - -# Verify that we have last file in zip -if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then - exit 1 -fi - -# Set env variables -echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc -echo "QNX SDP = 7.0.0" >> ~/versions.txt - From 7520be78cfeacc4564759c9d10313bb09b3a9109 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 25 Sep 2018 10:44:06 +0200 Subject: [PATCH 05/14] Update submodules on '5.12' in qt5 Exclude qtwebengine in this round. Change-Id: Iccbd8d5f4f4c016eab24f8b969aa485bb59a1d62 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtremoteobjects | 2 +- qtsensors | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/qt3d b/qt3d index dca07bf5..9a0cbcc5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit dca07bf5b82af982db8b4c442e606b027bf52cb0 +Subproject commit 9a0cbcc53c16e36ac161b04fdd1fe3d843951ed9 diff --git a/qtactiveqt b/qtactiveqt index 9f68ebfd..371c0e83 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 9f68ebfd2172dc807fb3e24c36ae8c0bec03dad0 +Subproject commit 371c0e8389cebc5bd4e9726c31596ad3b56b33fc diff --git a/qtbase b/qtbase index 232fe3ab..8a763507 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 232fe3ab6a2eb0585c77c0aee4769493ba23c35a +Subproject commit 8a763507885309666ae8500c9bdea9af5d46be28 diff --git a/qtcanvas3d b/qtcanvas3d index e07c2ea8..d62f4bf2 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit e07c2ea85f4681acec6fc07a04d2b08f1da0ced6 +Subproject commit d62f4bf2b9e51728dad3d659bcc336392fd24326 diff --git a/qtcharts b/qtcharts index b3a1e386..d87ebea3 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b3a1e386ea584df1a16b645845b22942016464ca +Subproject commit d87ebea3be105e8e5f46e096af5109b9d2eb7e0a diff --git a/qtconnectivity b/qtconnectivity index 66829dd1..77f5510f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 66829dd14377f61b54986f1870bc014daa71e268 +Subproject commit 77f5510fd636895d49c87ccbb504154925b40703 diff --git a/qtdeclarative b/qtdeclarative index 6982d0d6..50f05e20 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6982d0d6290c137468749bb8ab2f2e20dfa453fd +Subproject commit 50f05e20d5609d44159831c899bedd35653a66ba diff --git a/qtdoc b/qtdoc index ba9709b4..462fa235 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ba9709b459e7b102aa37f06d351cf7d937d45c76 +Subproject commit 462fa235d4b799c12f664e9f6d8c0821d09bdc62 diff --git a/qtimageformats b/qtimageformats index c2cb9d28..ceebd297 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c2cb9d286695bd3985c3ad18366e640abcc760d3 +Subproject commit ceebd297c3e4365940469347208e5f22b764d6a3 diff --git a/qtlocation b/qtlocation index b5615f57..eaffef63 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b5615f571396365a07f123695a05be66c572f622 +Subproject commit eaffef633e98e2ea94acf5fd0e1a10676591bfa8 diff --git a/qtmultimedia b/qtmultimedia index 3ee5afe3..ae48330c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3ee5afe3a47152ab3a2d4a9acf3a5e0458441c98 +Subproject commit ae48330c105c24851312004a189487608542eb49 diff --git a/qtpurchasing b/qtpurchasing index cb92e437..21927fdb 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit cb92e437619c7fcb1d101bd89b033283bccd52f0 +Subproject commit 21927fdbdbe4d928d909b0a9e7992ed9bc817716 diff --git a/qtremoteobjects b/qtremoteobjects index e43c9fe0..ca13664f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e43c9fe03e6ff6849f43117c384c083c4bf8ff1d +Subproject commit ca13664fd6e6dfe4c5279e134f68c84037c5dd32 diff --git a/qtsensors b/qtsensors index 8364c9f6..76f3abf8 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 8364c9f67292851c79df284dd9ffaaaeb3a71156 +Subproject commit 76f3abf8e03344a73e32d1324cd7e6751b4039de diff --git a/qtsvg b/qtsvg index c2edcd01..588dbd7a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit c2edcd013a0671df72eefcbab84fa2941aa22044 +Subproject commit 588dbd7a680538d7880fdd5259a3c12a88338a85 diff --git a/qttools b/qttools index 22809a14..354ff30e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 22809a142e08955554c54be452f6ff2e079a7fd8 +Subproject commit 354ff30e04f99c6e08984183d6eb57e7ed669cf2 diff --git a/qttranslations b/qttranslations index bb5f0ac7..915095f6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit bb5f0ac724b7179df25c7d7442991eceea1fd58d +Subproject commit 915095f6394def6fe0c7fabd22cee5d7959564cb diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 4ea4835f..87c59672 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 4ea4835f22096dd2a9b8b14fa191f8bd8f8ad6bb +Subproject commit 87c5967277c26c8154c2fee1db5ba3debb9b5b19 diff --git a/qtwayland b/qtwayland index c1e36e21..582af706 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c1e36e212090cd02bc238f70dfeb70d7c651e348 +Subproject commit 582af70640e411d8f423f1bc0528d5a5fce08e3a diff --git a/qtwebglplugin b/qtwebglplugin index 35e13db6..870a8f2c 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 35e13db60aeee432dc115c691299955e9715b4c2 +Subproject commit 870a8f2cbec11696d5e378825e82fbb707cc4eaf diff --git a/qtwebsockets b/qtwebsockets index 02db65be..f1aaf566 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 02db65bebc051bf4e88457f315b8ecce2e784074 +Subproject commit f1aaf5660d2d7cd06f8b18fa30bce3393b752f9f From f35067c7c309e1434f53f9ef8b3347720a3855d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 24 Aug 2018 13:43:09 +0300 Subject: [PATCH 06/14] Set timezone to GMT in macOS'es MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit macOS doesn't support UTC, so we'll go with GMT. Task-number: QTQAINFRA-1641 Change-Id: Ifae9547b010c293c4a2cb18252e8f18961a4456a Reviewed-by: Tony Sarajärvi Reviewed-by: Edward Welbourne --- coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh | 2 ++ coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index 6f926777..ce8043fa 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -87,3 +87,5 @@ sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resourc echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts + +sudo systemsetup settimezone GMT diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh index 4737b8e9..d91316bd 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/05-systemsetup.sh @@ -87,3 +87,5 @@ sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resourc echo "Set Network Test Server address to $NTS_IP in /etc/hosts" echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts + +sudo systemsetup settimezone GMT From d58cfd0db95aa61208b9ecbdcc356ac68bba8d3c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 27 Sep 2018 21:45:12 +0200 Subject: [PATCH 07/14] Update submodules on '5.12' in qt5 Skip qtbase in this round. Change-Id: Ia649f87c2bc71d9e755b665ef9bc86e2f63f8d0d Reviewed-by: Liang Qi --- qt3d | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialport | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index 9a0cbcc5..f6302903 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9a0cbcc53c16e36ac161b04fdd1fe3d843951ed9 +Subproject commit f6302903649315325965820c0ca9a32e87aaa49f diff --git a/qtcanvas3d b/qtcanvas3d index d62f4bf2..8e097e44 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit d62f4bf2b9e51728dad3d659bcc336392fd24326 +Subproject commit 8e097e44aa457efcdb1a0b1ff00d8e794c3a8a18 diff --git a/qtcharts b/qtcharts index d87ebea3..3ad48662 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d87ebea3be105e8e5f46e096af5109b9d2eb7e0a +Subproject commit 3ad4866256e9efdc313ac557326c2796dfac8dfb diff --git a/qtconnectivity b/qtconnectivity index 77f5510f..b4e9cc6a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 77f5510fd636895d49c87ccbb504154925b40703 +Subproject commit b4e9cc6ab73019c04182248a8f65e9fa840d382b diff --git a/qtdatavis3d b/qtdatavis3d index 7320188f..913b61e0 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7320188f253b8a382a03dba170ae47deec0425e5 +Subproject commit 913b61e09d5aead27be69fc31eefb4178a64e69a diff --git a/qtdeclarative b/qtdeclarative index 50f05e20..d3083dbd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 50f05e20d5609d44159831c899bedd35653a66ba +Subproject commit d3083dbdc6a732b1933d66554116bb66ad9b2909 diff --git a/qtdoc b/qtdoc index 462fa235..1df70118 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 462fa235d4b799c12f664e9f6d8c0821d09bdc62 +Subproject commit 1df70118583e069bde41d03bc9753cef949b3e39 diff --git a/qtmultimedia b/qtmultimedia index ae48330c..4b8414b5 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ae48330c105c24851312004a189487608542eb49 +Subproject commit 4b8414b51dac70d949c0f516e1a7d8e723b97c29 diff --git a/qtnetworkauth b/qtnetworkauth index 51a0b723..876cd89e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 51a0b723032640e3b3f99adf3e392ed7d8ceec33 +Subproject commit 876cd89e273851f6e430d1f9ea47f6e667716c89 diff --git a/qtquickcontrols b/qtquickcontrols index 1056eb37..b8547726 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 1056eb37c970a7145755d0280f03d049d9a77bd5 +Subproject commit b854772676ff2b0e610b522279c997618496c050 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e8c61951..fba7e3cf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e8c619517ba1f75224c61334f67ae165d704b184 +Subproject commit fba7e3cf5c8ad287ceaaeb381989159d8baa96ec diff --git a/qtremoteobjects b/qtremoteobjects index ca13664f..6aea3961 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ca13664fd6e6dfe4c5279e134f68c84037c5dd32 +Subproject commit 6aea3961a9e911a734c577be9caf7ca30c6e48da diff --git a/qtserialport b/qtserialport index c5ffb2ab..a61ed3bc 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c5ffb2ab8f546c8d7c3e88760c2666d6d185ced0 +Subproject commit a61ed3bce7df1ec56712d874e23a7ec95ad141ab diff --git a/qttools b/qttools index 354ff30e..78ad4746 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 354ff30e04f99c6e08984183d6eb57e7ed669cf2 +Subproject commit 78ad47466567adb79c59a239d380906fa7aa61cc diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 87c59672..5260805b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 87c5967277c26c8154c2fee1db5ba3debb9b5b19 +Subproject commit 5260805b162030a6900bacf46d2a55b69075ae09 diff --git a/qtwayland b/qtwayland index 582af706..b1ae478a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 582af70640e411d8f423f1bc0528d5a5fce08e3a +Subproject commit b1ae478a754435a545877fa075ad9fd19ba6f5a0 diff --git a/qtwebengine b/qtwebengine index 7de23e9f..9787fb89 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7de23e9fbb4c48152de5c1d26ed34cd68666aa30 +Subproject commit 9787fb89c0c0234366e5d88b2e9194518d2590a3 diff --git a/qtwebsockets b/qtwebsockets index f1aaf566..df6d430d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f1aaf5660d2d7cd06f8b18fa30bce3393b752f9f +Subproject commit df6d430df70588238004bba0ca71b4d3beb7228c From 74ab43ba23450603a3b2936fe0afe7dd4256d325 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 29 Sep 2018 22:30:49 +0200 Subject: [PATCH 08/14] Update submodules on '5.12' in qt5 Change-Id: Ib44fb3e8fa52ff72bbe7f92630635a5158a02ed2 Reviewed-by: Qt Submodule Update Bot Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 8a763507..a34054c7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8a763507885309666ae8500c9bdea9af5d46be28 +Subproject commit a34054c75e18326d10328baa9e39fc9eab0cbfc9 diff --git a/qtconnectivity b/qtconnectivity index b4e9cc6a..54f9fe2c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b4e9cc6ab73019c04182248a8f65e9fa840d382b +Subproject commit 54f9fe2c230963797dd4f0f9efed7132b0dc429e diff --git a/qtdeclarative b/qtdeclarative index d3083dbd..863bc570 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d3083dbdc6a732b1933d66554116bb66ad9b2909 +Subproject commit 863bc570ca9d8f08b9fbedee903faf63622fac3c diff --git a/qtdoc b/qtdoc index 1df70118..6ba53b90 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1df70118583e069bde41d03bc9753cef949b3e39 +Subproject commit 6ba53b907f5a0e509e891512aa711285ddb1fb17 diff --git a/qtmultimedia b/qtmultimedia index 4b8414b5..ad9f763e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4b8414b51dac70d949c0f516e1a7d8e723b97c29 +Subproject commit ad9f763efea36663bf17321459d44e8dd5e5e653 diff --git a/qtqa b/qtqa index 711ef5a1..1b2fcea1 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 711ef5a1611b3f9428811856abdcbb8cd335d2d4 +Subproject commit 1b2fcea1485a291e3be885bed29f03f920ac9d90 diff --git a/qtwebengine b/qtwebengine index 9787fb89..033c0c3f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9787fb89c0c0234366e5d88b2e9194518d2590a3 +Subproject commit 033c0c3ffec807b86d6c08e5dc95ec541927c53d From 269e38c27ca581a1819133887f4e6557b009cdc0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 30 Sep 2018 17:30:07 +0200 Subject: [PATCH 09/14] Update submodules on '5.12' in qt5 Change-Id: I1705b1d1b99f4a547bcd6c0c7d17a65f61aea44a Reviewed-by: Liang Qi --- qtbase | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index a34054c7..69e68218 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a34054c75e18326d10328baa9e39fc9eab0cbfc9 +Subproject commit 69e68218e5082166d5c4ab1903fbacde00418a1c diff --git a/qtwebengine b/qtwebengine index 033c0c3f..774f8d3d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 033c0c3ffec807b86d6c08e5dc95ec541927c53d +Subproject commit 774f8d3d8099286ee1202fb8b809b399b4632fb3 From bc7af0171f1798951cc349cc1a62e64a217c46c0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 1 Oct 2018 17:49:48 +0200 Subject: [PATCH 10/14] Update submodules on '5.12' in qt5 Change-Id: Idb32934a75413896c3a1ea64cd0a69a42d75e9f5 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 69e68218..07e92611 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 69e68218e5082166d5c4ab1903fbacde00418a1c +Subproject commit 07e92611050f78dae93bcd362112efd8efa7b41e diff --git a/qtdeclarative b/qtdeclarative index 863bc570..1dce83ba 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 863bc570ca9d8f08b9fbedee903faf63622fac3c +Subproject commit 1dce83ba31e0e480b8eae43c1fc59c6cd5bb4d5c diff --git a/qtdoc b/qtdoc index 6ba53b90..12280c1b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6ba53b907f5a0e509e891512aa711285ddb1fb17 +Subproject commit 12280c1b0da0cc4a22238adeb62459299a897749 diff --git a/qtquickcontrols b/qtquickcontrols index b8547726..352be75d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b854772676ff2b0e610b522279c997618496c050 +Subproject commit 352be75dec15cb333f58d0075d89b2ebc7a2e46b diff --git a/qtremoteobjects b/qtremoteobjects index 6aea3961..833c58da 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6aea3961a9e911a734c577be9caf7ca30c6e48da +Subproject commit 833c58dacdb20511f0e7912f631f6c2a4f5412d5 diff --git a/qttools b/qttools index 78ad4746..598544e1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 78ad47466567adb79c59a239d380906fa7aa61cc +Subproject commit 598544e1287eaa6f8b0e0e16eb376ff523e479bd diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5260805b..2c603d66 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5260805b162030a6900bacf46d2a55b69075ae09 +Subproject commit 2c603d66246e80b1f974b9ad5f712136d83bb354 diff --git a/qtwayland b/qtwayland index b1ae478a..a1ca3ae5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b1ae478a754435a545877fa075ad9fd19ba6f5a0 +Subproject commit a1ca3ae56f33bff34db71d1dec6104d0d6614e6d diff --git a/qtwebengine b/qtwebengine index 774f8d3d..3257ab9c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 774f8d3d8099286ee1202fb8b809b399b4632fb3 +Subproject commit 3257ab9ce01b01b667237fd6ad33512739db5b01 diff --git a/qtwebglplugin b/qtwebglplugin index 870a8f2c..36d9bcc2 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 870a8f2cbec11696d5e378825e82fbb707cc4eaf +Subproject commit 36d9bcc2cf1f26afe7e336b13ce59aae54e3cec8 diff --git a/qtwebsockets b/qtwebsockets index df6d430d..247373d6 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit df6d430df70588238004bba0ca71b4d3beb7228c +Subproject commit 247373d6501bab94ce1ea0048e390bd910963db9 From 260d66f94ed803f4872e1b7366ebfb681202e499 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 2 Oct 2018 22:30:50 +0200 Subject: [PATCH 11/14] Update submodules on '5.12' in qt5 Updated qtwebengine once againt to have a fix for getting beta1 out Change-Id: I3de7ad0916e886722186f09da036ea7a398f363f Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index f6302903..ece6a775 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f6302903649315325965820c0ca9a32e87aaa49f +Subproject commit ece6a7759d4590b50ced79a0c86323318ac8815d diff --git a/qtbase b/qtbase index 07e92611..18be2337 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 07e92611050f78dae93bcd362112efd8efa7b41e +Subproject commit 18be2337ea85655e39f4ffe3b77d2b3ab243c140 diff --git a/qtdeclarative b/qtdeclarative index 1dce83ba..ec866a4d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1dce83ba31e0e480b8eae43c1fc59c6cd5bb4d5c +Subproject commit ec866a4d72ee5d07c44257d409796c171bcd04f2 diff --git a/qtremoteobjects b/qtremoteobjects index 833c58da..0ebd459b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 833c58dacdb20511f0e7912f631f6c2a4f5412d5 +Subproject commit 0ebd459bf781ff22a4a0aac460c230874cc0fe52 diff --git a/qttools b/qttools index 598544e1..ede2bcd3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 598544e1287eaa6f8b0e0e16eb376ff523e479bd +Subproject commit ede2bcd3a9dacd31e0b274b2591850dd15cf8b7d diff --git a/qtwebengine b/qtwebengine index 3257ab9c..f89ded9f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3257ab9ce01b01b667237fd6ad33512739db5b01 +Subproject commit f89ded9f17a59ca1ffe4d8711c0af4d54489e105 From e85296ba988ea6e81b8ad7edd4186488849c5798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 3 Oct 2018 09:00:11 +0300 Subject: [PATCH 12/14] Optimize macOS build targets by removing excess builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I983f7558dabddf7e91f855dbead6dc0172db127c Reviewed-by: Jani Heikkinen Reviewed-by: Tor Arne Vestbø --- coin/platform_configs/default.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 5615d770..eb9e6fac 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -13,10 +13,8 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo -qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release qtci-macos-10.13-x86_64 Clang Packaging DebugAndRelease Release -qtci-macos-10.12-x86_64-8 Clang DeveloperBuild Release QtNamespace NoPch -qtci-macos-10.12-x86_64-8 Clang Release NoFramework DisableTests +qtci-macos-10.12-x86_64-8 Clang DeveloperBuild NoFramework Release QtNamespace NoPch qtci-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests From ca36d5b3fa5c950c9ce6e82cb507b4fa3c210a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 14 Sep 2018 13:21:02 +0300 Subject: [PATCH 13/14] Provisioning: Ubuntu 18.04: Use internal package mirror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using internal package mirror during provisioning reduces outgoing web traffic by a huge amount. Task-number: QTQAINFRA-2213 Change-Id: I6a63b51efbf411a712795a6347c2deeed6ac44d3 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 92b7a990..b81bd807 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -44,6 +44,19 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai sudo systemctl stop $service sudo systemctl disable $service done + +function set_internal_repo { + sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-updates main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-backports main restricted universe + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ bionic-security main restricted universe multiverse +EOC +} + +(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories." + # Git is not needed by builds themselves, but is nice to have # immediately as one starts debugging installPackages+=(git) @@ -145,12 +158,12 @@ installPackages+=(dkms) # Needed for qtspeech installPackages+=(libspeechd-dev) -echo "Installing packages" -waitLoop -sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" echo "Running update for apt" waitLoop sudo apt-get update +echo "Installing packages" +waitLoop +sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" # Install all needed packages in a special wheel cache directory pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt From 7b9c3ced842644736da18859b7c0d78182901f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 2 Oct 2018 06:52:06 +0300 Subject: [PATCH 14/14] Provisioning: Ubuntu_16.04_x64: Use internal mirror Currently the internal package mirroring is being enabled only after the installation of the packages. It should be done before to actually download them from the internal repo instead of the official repos. Change-Id: I4aeb2e463ae804bd2f8ce9536ab89fc26fedbdb5 Reviewed-by: Heikki Halmet --- .../qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 2855d70d..4559151e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -161,6 +161,17 @@ installPackages+=(dkms) #Pypdf for QSR documentation installPackages+=(python-pypdf2) +sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe +deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse +deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse +deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse +deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe +deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse +EOC + echo "Running update for apt" sudo apt-get update echo "Installing packages" @@ -171,10 +182,3 @@ pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/share source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" - -sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse -EOC