From edc39be08b55f07abdb29c6ba3527fd31e6b928d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 13 May 2019 17:11:00 +0200 Subject: [PATCH 01/16] Fix qtdeclarative boot2qt CI config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DISTRO_OPTS was missing quotes. The same thing is also done in 3e6a04c09d8457d64b6dd3d6d95b9d3adb8b3413. Change-Id: Ibb237b791fedea4edde2ca0ef152553502462129 Reviewed-by: Aapo Keskimolo (cherry picked from commit 04fa1bf4ef48599973eceef5c3008ce7ca72a25b) Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtdeclarative.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 8e9e48fb..a36c94a5 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features Configure arguments --------------------------------- ------------------- ----------- ----------- -------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS=hard-float boot2qt -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb From 47225925c56f2d959de905b774944ad6c4b6af41 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 22 May 2019 14:01:42 +0200 Subject: [PATCH 02/16] Update submodules on 'dev' in qt5 Skip qtbase in this round. Change-Id: I3434ffc21f21f953f0538e86e0d554ae5e82b331 Reviewed-by: Liang Qi --- qt3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index b0db56de..fd748aba 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b0db56ded0f38e9f59f379c6ff80b668ed49c743 +Subproject commit fd748abaab7c1369613be2754e614041a0339502 diff --git a/qtconnectivity b/qtconnectivity index 16e37407..6b9469b1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 16e37407cd6ad369d5250de1b9dac83083a45200 +Subproject commit 6b9469b1a229486986f572af09459dacce5795de diff --git a/qtdeclarative b/qtdeclarative index 3fff0304..7257358e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3fff03048a48aa7ead6e888165b2ae5a118d675c +Subproject commit 7257358e44b373ebdd147162f7b5596d27420e7b diff --git a/qtdoc b/qtdoc index 9debad60..81061285 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9debad60b88ffb51f50d111f9b4f871f5418622b +Subproject commit 81061285220ccada412d4891f2a76867844dd883 diff --git a/qtmultimedia b/qtmultimedia index f0f354f2..afca8928 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f0f354f2a1eec54733c871bf735f67e0c4ea945c +Subproject commit afca8928ce8e4113a224e57fa30a3b4bc5a2db47 diff --git a/qtqa b/qtqa index 5f9ea5ce..ececaf29 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5f9ea5ce0af3cd93a5a57cbda9314996c96c0cd2 +Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f diff --git a/qtremoteobjects b/qtremoteobjects index 99df6cb9..0f628fc1 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 99df6cb9fc2cd598dd33c89e7781f5963b739508 +Subproject commit 0f628fc1ac247a88bc68e3b3977aa9802c1129bc diff --git a/qtserialbus b/qtserialbus index f12d420e..fdf0ff9d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f12d420e8492b85e8aa2a7982e81a88cb1098d6c +Subproject commit fdf0ff9dfbc62cdaa86da3b4c47c99806161ec0e diff --git a/qttools b/qttools index ee122e6a..770ef385 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ee122e6a0752634ed9dddf0937fa386709059c75 +Subproject commit 770ef38581c95df9c8bf378e8446ecd2df91e549 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fe52858d..460a7cee 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fe52858df5c641eb9fb0df02e33d5b328d6b00e7 +Subproject commit 460a7cee80e21df752501161c91b08c2059612fb diff --git a/qtwayland b/qtwayland index 14d37a53..03ac8d67 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 14d37a53a674d7dbef32e718ae391e265fad5fac +Subproject commit 03ac8d67fb6a94ae9c28325e306fd4291fde8bb6 diff --git a/qtwebengine b/qtwebengine index 0c2beb49..0f081baa 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0c2beb49b858f49489fa4f1ecee6bfdd6ce57e68 +Subproject commit 0f081baa31facec779057de29eec14c6f458f6a6 diff --git a/qtwebview b/qtwebview index fac66332..0a8a69d5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fac66332c76e2fc9c29aa2508a41cd9392825d25 +Subproject commit 0a8a69d51042b95649dbdf471acb3c96228f372e diff --git a/qtxmlpatterns b/qtxmlpatterns index e5582749..55c62fdd 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e5582749e285ff22b634b1e7d0a37f076b2a7be3 +Subproject commit 55c62fdd9cc1f9ec0fc18c6b4d804d9cb065dce0 From 5d3976765c43277a863b61e8bad0e59cf2424d31 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 26 May 2019 20:49:48 +0200 Subject: [PATCH 03/16] Update submodules on 'dev' in qt5 Skip qtbase in this round. Change-Id: Icc5ee34380c08b8365128c4f2e18240c6d50a90c Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtdeclarative | 2 +- qtremoteobjects | 2 +- qtsvg | 2 +- qttools | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index fd748aba..4ccdf859 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fd748abaab7c1369613be2754e614041a0339502 +Subproject commit 4ccdf85931d97188c68b54b09a4e2ffbeff6b2a2 diff --git a/qtactiveqt b/qtactiveqt index 2d740d31..f1c8d289 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2d740d313342a014169d5f317da53e499ff4432e +Subproject commit f1c8d2893d385ccfec2049655392ffca309675bd diff --git a/qtdeclarative b/qtdeclarative index 7257358e..19ca4af1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7257358e44b373ebdd147162f7b5596d27420e7b +Subproject commit 19ca4af1a248486844ea9bf96eba62ce564ecdc9 diff --git a/qtremoteobjects b/qtremoteobjects index 0f628fc1..91d3ef83 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0f628fc1ac247a88bc68e3b3977aa9802c1129bc +Subproject commit 91d3ef83c7572fefdc059470ec7582c2d7ec9190 diff --git a/qtsvg b/qtsvg index 1983ba1d..a21cf52e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1983ba1de3d4ffec65fcfbd74328963afb2c57c1 +Subproject commit a21cf52e101ad50c330ad0b42416cc83318afea7 diff --git a/qttools b/qttools index 770ef385..96d7a808 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 770ef38581c95df9c8bf378e8446ecd2df91e549 +Subproject commit 96d7a8089e06436072cfc232383ed45d2dd34430 diff --git a/qtxmlpatterns b/qtxmlpatterns index 55c62fdd..fe047565 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 55c62fdd9cc1f9ec0fc18c6b4d804d9cb065dce0 +Subproject commit fe0475651556878b8b80b38058e5fa743822ddce From dae67b28abc19e6208a25d2eaa88ce4337c5809d Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 28 May 2019 22:15:01 +0200 Subject: [PATCH 04/16] Update submodules on 'dev' in qt5 Skip qtbase in this round. Change-Id: Id1f988ef49bc35a1d230480af14fc90d4efa86b8 Reviewed-by: Liang Qi --- qt3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 4ccdf859..f39178a4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4ccdf85931d97188c68b54b09a4e2ffbeff6b2a2 +Subproject commit f39178a415cb41470775a86e0aa358faa3686d81 diff --git a/qtcharts b/qtcharts index 9e28f427..5bc7cc7c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9e28f427009ee3cd25b4d1a8cd446049d51152a4 +Subproject commit 5bc7cc7c5c9f4bdc72ae23c16c3c78d6bff86365 diff --git a/qtdatavis3d b/qtdatavis3d index 21583347..d7854291 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 215833472171b17db506d49646c639b4fff926ab +Subproject commit d78542919276ee6a87bfd75b83276dd72b791aaa diff --git a/qtdeclarative b/qtdeclarative index 19ca4af1..9d61684d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 19ca4af1a248486844ea9bf96eba62ce564ecdc9 +Subproject commit 9d61684d70c8691d81536b7b519388586e2cbbb8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index da150dac..2ee351b3 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit da150dacec8a2a68d290141b1e0ab268ce648edb +Subproject commit 2ee351b36b265ead80a6240c83fa9ab5d444bf08 diff --git a/qtremoteobjects b/qtremoteobjects index 91d3ef83..6f087313 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 91d3ef83c7572fefdc059470ec7582c2d7ec9190 +Subproject commit 6f0873134652fb5cba3d340075fdf99989c462b4 diff --git a/qtrepotools b/qtrepotools index 64abf60a..f6f2b04b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c +Subproject commit f6f2b04bd1dbeae3bdaaf683357087296ab37393 diff --git a/qtscxml b/qtscxml index 01bc8df0..fba55184 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 01bc8df0760e14449ca7d5b6c187bf9870efbd3d +Subproject commit fba55184b93e8f084b45716162581a6132fe94cc diff --git a/qtsvg b/qtsvg index a21cf52e..357a5bd4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a21cf52e101ad50c330ad0b42416cc83318afea7 +Subproject commit 357a5bd4d6682a50d85c88ba485ed34c745fae85 diff --git a/qttools b/qttools index 96d7a808..a3190387 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 96d7a8089e06436072cfc232383ed45d2dd34430 +Subproject commit a3190387ab37849cd5ded6fcf350afca8cd17246 diff --git a/qtwayland b/qtwayland index 03ac8d67..7107f750 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 03ac8d67fb6a94ae9c28325e306fd4291fde8bb6 +Subproject commit 7107f7501df329cf785cec1585767e5d7cbab6c2 diff --git a/qtwebchannel b/qtwebchannel index 6031bd7b..b376dfa4 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6031bd7bfdf97c492f9f11b4bd0a5375613b55de +Subproject commit b376dfa4242db85269d138f7e9a77f5bb13964b6 diff --git a/qtwebengine b/qtwebengine index 0f081baa..a69029cf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0f081baa31facec779057de29eec14c6f458f6a6 +Subproject commit a69029cf9fcfd0c1fcdaafe5cbcbff2d5dd6b5c5 diff --git a/qtwebsockets b/qtwebsockets index 2e54dbe8..79812864 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2e54dbe86eac61e87782a138dbcc158cb6b10cd9 +Subproject commit 7981286485f6fa958133718d31dc3a2c2cc21d8f diff --git a/qtwebview b/qtwebview index 0a8a69d5..d1fc6826 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0a8a69d51042b95649dbdf471acb3c96228f372e +Subproject commit d1fc6826660b8c52df4c3b0deb2ab650e0b46767 From 84ff024609e4eca003c604294b4102e73deba8c3 Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Thu, 23 May 2019 13:42:47 +0000 Subject: [PATCH 05/16] Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 577d01e9dfaa9e69608097c550bd1877b5a9b735. Reason for revert: force vmx instructions to Coin level B virtual machine Change-Id: I54a97fb6dc96315768c8047d487f1ed354ab4aac Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/docker.ps1 | 85 +++++++++++++++++++ .../qtci-windows-10-x86_64/95-docker.ps1 | 6 ++ 2 files changed, 91 insertions(+) create mode 100644 coin/provisioning/common/windows/docker.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 diff --git a/coin/provisioning/common/windows/docker.ps1 b/coin/provisioning/common/windows/docker.ps1 new file mode 100644 index 00000000..6f53eccd --- /dev/null +++ b/coin/provisioning/common/windows/docker.ps1 @@ -0,0 +1,85 @@ +############################################################################# +## +## 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 installs Docker tool kits and Apple Bonjour on Windows. + +function DownloadAndInstall +{ + Param ( + [string]$externalUrl, + [string]$internalUrl, + [string]$package, + [string]$sha1, + [string]$parameters + ) + + Write-Host "Fetching $package from URL..." + Download $externalUrl $internalUrl $package + Verify-Checksum $package $sha1 + + Write-Host "Installing $package..." + Run-Executable $package $parameters + + Write-Host "Remove $package..." + Remove-Item -Path $package +} + +# Install Docker Toolbox +$package = Get-DownloadLocation "DockerToolbox.exe" +$externalUrl = "https://download.docker.com/win/stable/DockerToolbox.exe" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.exe" +$sha1 = "62325c426ff321d9ebfb89664d65cf9ffaef2985" +DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/SP- /SILENT" +Add-Path 'C:\Program Files\Docker Toolbox' +docker --version +docker-compose --version + +# Install Apple Bonjour +$package = Get-DownloadLocation "BonjourPSSetup.exe" +$externalUrl = "http://support.apple.com/downloads/DL999/en_US/BonjourPSSetup.exe" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/BonjourPSSetup.exe" +$sha1 = "847f39e0ea80d2a4d902fe59657e18f5bc32a8cb" +DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/qr" + +# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support +$testserver = "$PSScriptRoot\..\shared\testserver\docker_testserver.sh" +$sysInfoStr = systeminfo +if ($sysInfoStr -like "*A hypervisor has been detected*") { + & 'C:\Program Files\Git\bin\bash.exe' --login $testserver Hyper-V +} elseif ($sysInfoStr -like "*Virtualization Enabled In Firmware: Yes*") { + & 'C:\Program Files\Git\bin\bash.exe' --login $testserver VMX +} else { + Write-Error "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 new file mode 100644 index 00000000..df735855 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 @@ -0,0 +1,6 @@ +# Disable Hyper-V from Windows 10 Pro/Enterprise +# Because VirtualBox is a type 2 hypervisor, it can't run if Hyper-V virtual machines are in use. +# Otherwise, docker-machine will complain about "VT-x is not available (VERR_VMX_NO_VMX)". +Disable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V-All -NoRestart + +. "$PSScriptRoot\..\common\windows\docker.ps1" From d869c671b5c15c48d1d03e482d5640ea6dda6e06 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 18 Jun 2019 10:06:49 +0200 Subject: [PATCH 06/16] Update submodules on 'dev' in qt5 Skip qtbase in this round. Change-Id: Idd621fa568f01f4e4481da61a4e2fb8fe1bdcaba Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/qt3d b/qt3d index f39178a4..c166f615 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f39178a415cb41470775a86e0aa358faa3686d81 +Subproject commit c166f615647b1e0635ad109e18ddc2870819421b diff --git a/qtactiveqt b/qtactiveqt index f1c8d289..95ecd545 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f1c8d2893d385ccfec2049655392ffca309675bd +Subproject commit 95ecd545be0ca40bf6328c4d1ae95f5fbc247c9f diff --git a/qtcharts b/qtcharts index 5bc7cc7c..6d4a7dd1 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5bc7cc7c5c9f4bdc72ae23c16c3c78d6bff86365 +Subproject commit 6d4a7dd15e57cbcb71c5a118fb9b63bef4df9819 diff --git a/qtconnectivity b/qtconnectivity index 6b9469b1..bbd5a988 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6b9469b1a229486986f572af09459dacce5795de +Subproject commit bbd5a988592e31b5f8ec0a111e7fea30c222f0ec diff --git a/qtdatavis3d b/qtdatavis3d index d7854291..e82f57fc 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d78542919276ee6a87bfd75b83276dd72b791aaa +Subproject commit e82f57fc52fc9bdae9c2acfe624b927103b775f3 diff --git a/qtdeclarative b/qtdeclarative index 9d61684d..8068e7b9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9d61684d70c8691d81536b7b519388586e2cbbb8 +Subproject commit 8068e7b98cde09565efe27585b84e120f9c5ea99 diff --git a/qtdoc b/qtdoc index 81061285..205db431 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 81061285220ccada412d4891f2a76867844dd883 +Subproject commit 205db431cad9bc40581400573d9d626f82d94052 diff --git a/qtlocation b/qtlocation index 971423c5..a7fc9ec3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 971423c512623b84618cfc73b992da1f1dc014f8 +Subproject commit a7fc9ec342ca1eac08bf5902ccc17c4d64132bbd diff --git a/qtmultimedia b/qtmultimedia index afca8928..c29fcbca 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit afca8928ce8e4113a224e57fa30a3b4bc5a2db47 +Subproject commit c29fcbca82943c23bc21fcafb204a78ec29d3ef8 diff --git a/qtqa b/qtqa index ececaf29..76b891a5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ececaf29b2f5de75ae4b00e44a5a0f09bc65e80f +Subproject commit 76b891a51af47b2b7b6d7a1cf6deb03eab2f0699 diff --git a/qtquickcontrols b/qtquickcontrols index d2a661f1..2785bcb8 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d2a661f16e9982c45260efb9875b83c581b82287 +Subproject commit 2785bcb8f0ac04d0d2bc73b06206af1566c43958 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2ee351b3..9e54a59d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2ee351b36b265ead80a6240c83fa9ab5d444bf08 +Subproject commit 9e54a59d9bee3ccc0a8c3e63e210ca0b3fa1eb05 diff --git a/qtremoteobjects b/qtremoteobjects index 6f087313..16390764 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6f0873134652fb5cba3d340075fdf99989c462b4 +Subproject commit 1639076404e4ece74c103e16356cce6bd9cff9e8 diff --git a/qtrepotools b/qtrepotools index f6f2b04b..61191bf3 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f6f2b04bd1dbeae3bdaaf683357087296ab37393 +Subproject commit 61191bf37d3e03f190943725c2c99d9c5fcb3fdf diff --git a/qtscript b/qtscript index 583dcc6d..0f93eff7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 583dcc6d31bb44d9d36c6a18dd71d54cbb6d5683 +Subproject commit 0f93eff78f1396f4d55e08b1bffaf7ce557b364f diff --git a/qtscxml b/qtscxml index fba55184..84bb562b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit fba55184b93e8f084b45716162581a6132fe94cc +Subproject commit 84bb562bfc1168121774d3c4b073e3e05b6efcde diff --git a/qtserialbus b/qtserialbus index fdf0ff9d..73a56bec 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fdf0ff9dfbc62cdaa86da3b4c47c99806161ec0e +Subproject commit 73a56becfeb960cfd4145bfb0ab597cd72705fa4 diff --git a/qtspeech b/qtspeech index 5cf744a0..e80a2764 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 5cf744a096bb079bd33e417e9fb62a6d6726a3a3 +Subproject commit e80a2764eae65743d3d6a3195c92fd3a3fee998a diff --git a/qtsvg b/qtsvg index 357a5bd4..b367ddfe 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 357a5bd4d6682a50d85c88ba485ed34c745fae85 +Subproject commit b367ddfed778ac2f3ce28e39ba83bbe3c1e1437c diff --git a/qttools b/qttools index a3190387..fb217099 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a3190387ab37849cd5ded6fcf350afca8cd17246 +Subproject commit fb217099b4e03aaa2893e59470a4fe3ec125c9a7 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 460a7cee..89c1ba87 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 460a7cee80e21df752501161c91b08c2059612fb +Subproject commit 89c1ba8732069dc73943e2ab66111cd5ed7d988d diff --git a/qtwayland b/qtwayland index 7107f750..def0e414 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7107f7501df329cf785cec1585767e5d7cbab6c2 +Subproject commit def0e4145f1d329679a8c603405bd0e96f2d9484 diff --git a/qtwebengine b/qtwebengine index a69029cf..9680828a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a69029cf9fcfd0c1fcdaafe5cbcbff2d5dd6b5c5 +Subproject commit 9680828ac40d6e10eac02f4981f3668669409acf diff --git a/qtwebsockets b/qtwebsockets index 79812864..54ffd0d0 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 7981286485f6fa958133718d31dc3a2c2cc21d8f +Subproject commit 54ffd0d0a3bf2c77d53e1cdfe04b362f59682cb4 diff --git a/qtwinextras b/qtwinextras index 878d6226..5c6762c5 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 878d6226f2472b3dff192207aa0c2a03eb4d3465 +Subproject commit 5c6762c53d47b3bd3b604afd389669a3670b1ec5 diff --git a/qtxmlpatterns b/qtxmlpatterns index fe047565..fc214a5d 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fe0475651556878b8b80b38058e5fa743822ddce +Subproject commit fc214a5d298e9d916882528c43e78e386ff8b0ad From a0b69977c6c54c33a9bf6e1e412e8ec1ee5bdf20 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 18 Jun 2019 11:20:22 +0200 Subject: [PATCH 07/16] Add qtquicktimeline as a submodule in qt5.git#dev Task-number: QDS-54 Change-Id: Ic92eb39b8bd9fced3b4a701f4d40364a2d8f9e95 Reviewed-by: Jani Heikkinen --- .gitmodules | 6 ++++++ qtquicktimeline | 1 + 2 files changed, 7 insertions(+) create mode 160000 qtquicktimeline diff --git a/.gitmodules b/.gitmodules index 5bd390c4..b3c46af7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -312,3 +312,9 @@ url = ../qtlottie.git branch = dev status = preview +[submodule "qtquicktimeline"] + depends = qtbase qtdeclarative + path = qtquicktimeline + url = ../qtquicktimeline + branch = dev + status = preview diff --git a/qtquicktimeline b/qtquicktimeline new file mode 160000 index 00000000..6e6d4927 --- /dev/null +++ b/qtquicktimeline @@ -0,0 +1 @@ +Subproject commit 6e6d4927f4620e58bd6acf71a0c6f54513f47c5f From 19894d279f0c8250c7425a0854e41b3c1130d53b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 24 Jun 2019 09:31:56 +0200 Subject: [PATCH 08/16] Update submodules on 'dev' in qt5 Skip qttools in this round. Temporarily ignore qtwebengine due to QTBUG-76549. Change-Id: I93afa1bedb18392a3f6c7ae676690b87f07aeaf9 Reviewed-by: Liang Qi --- .gitmodules | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialport | 2 +- qtwayland | 2 +- qtwinextras | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index b3c46af7..f954739a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = dev - status = addon + status = ignore priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative diff --git a/qtactiveqt b/qtactiveqt index 95ecd545..e453d672 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 95ecd545be0ca40bf6328c4d1ae95f5fbc247c9f +Subproject commit e453d6720d185da8b882f71572b1130659f16262 diff --git a/qtbase b/qtbase index a0c4b6f3..b17e0572 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a0c4b6f34546bdd22167a76a0540d37e9a37c0cf +Subproject commit b17e05729e3404d2fe65f28a903a7a1b9f6cc115 diff --git a/qtconnectivity b/qtconnectivity index bbd5a988..eb78e559 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit bbd5a988592e31b5f8ec0a111e7fea30c222f0ec +Subproject commit eb78e559661ac86715d7546d28a88160acb8ec30 diff --git a/qtlocation b/qtlocation index a7fc9ec3..b1e78d73 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a7fc9ec342ca1eac08bf5902ccc17c4d64132bbd +Subproject commit b1e78d739752a044765776a59161809011875a5c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9e54a59d..e4926383 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9e54a59d9bee3ccc0a8c3e63e210ca0b3fa1eb05 +Subproject commit e4926383bd51321e0a04a361440fca8fad557395 diff --git a/qtremoteobjects b/qtremoteobjects index 16390764..a8d2e091 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1639076404e4ece74c103e16356cce6bd9cff9e8 +Subproject commit a8d2e0917cae57de193175f85accc109670419df diff --git a/qtserialport b/qtserialport index 450156f3..a0faf986 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 450156f37356f67f217de760a5df3149684dd99f +Subproject commit a0faf986fccdce1d36f3308dc520cdac001f5264 diff --git a/qtwayland b/qtwayland index def0e414..993863c4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit def0e4145f1d329679a8c603405bd0e96f2d9484 +Subproject commit 993863c4527f0565a77d7728446f954732a3c2b8 diff --git a/qtwinextras b/qtwinextras index 5c6762c5..b9b88962 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 5c6762c53d47b3bd3b604afd389669a3670b1ec5 +Subproject commit b9b88962fe2f3ec23c06143129e6753ef3fd675a From 03969bfe230d852f5e0cc78b878313dcb1061b15 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 27 Jun 2019 13:27:19 +0200 Subject: [PATCH 09/16] Update submodules on 'dev' in qt5 Change-Id: Ie0b1c3abcaea4a74279a7001cadecac70c1f853b Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt3d b/qt3d index c166f615..9486ac48 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c166f615647b1e0635ad109e18ddc2870819421b +Subproject commit 9486ac4845173c4fec4e22aad68382eb95a48b01 diff --git a/qtactiveqt b/qtactiveqt index e453d672..83686958 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e453d6720d185da8b882f71572b1130659f16262 +Subproject commit 83686958db030a860a5af67c3576da25dc881fe8 diff --git a/qtandroidextras b/qtandroidextras index ecdf7177..7587c6f3 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit ecdf7177b90c8c5de060da076b12e4869e57b4d5 +Subproject commit 7587c6f319c00f4471e70cf913155d30d6026d49 diff --git a/qtbase b/qtbase index b17e0572..5859f7d0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b17e05729e3404d2fe65f28a903a7a1b9f6cc115 +Subproject commit 5859f7d0d9440f82086486639a707f3935696cf4 diff --git a/qtcharts b/qtcharts index 6d4a7dd1..248fff48 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 6d4a7dd15e57cbcb71c5a118fb9b63bef4df9819 +Subproject commit 248fff483ae1597c62a93edf91841b84b363739b diff --git a/qtconnectivity b/qtconnectivity index eb78e559..a628d05c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit eb78e559661ac86715d7546d28a88160acb8ec30 +Subproject commit a628d05ced75d0666bd462f94807d3d600ca25d2 diff --git a/qtdatavis3d b/qtdatavis3d index e82f57fc..afd72ec3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e82f57fc52fc9bdae9c2acfe624b927103b775f3 +Subproject commit afd72ec3dd177249fcb78683c13cae780a1a59f9 diff --git a/qtdeclarative b/qtdeclarative index 8068e7b9..9834ac56 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8068e7b98cde09565efe27585b84e120f9c5ea99 +Subproject commit 9834ac56049408fbd848e364a82aabddc0815a07 diff --git a/qtgamepad b/qtgamepad index 337abe99..0a08df18 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 337abe99492d7d6d5229b615fa1559fc2f4ee6eb +Subproject commit 0a08df18e079f6cbb0d01a2dccea20e4a98acc50 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index fe2eefc0..86f56a81 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit fe2eefc036f3f42457e7f2e012f21fdec84550eb +Subproject commit 86f56a816995a42cc7c1d9ade70601e3729a363e diff --git a/qtlocation b/qtlocation index b1e78d73..4917caeb 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b1e78d739752a044765776a59161809011875a5c +Subproject commit 4917caebcd9e2ca92bbbad8234c887fbc1bec0ed diff --git a/qtmacextras b/qtmacextras index ca1414e6..f37e6bf9 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ca1414e6b7ce219efa86e965a5c031b79e7a604e +Subproject commit f37e6bf9fab5e326c471757d4577d52e9598ac72 diff --git a/qtmultimedia b/qtmultimedia index c29fcbca..7512ac33 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c29fcbca82943c23bc21fcafb204a78ec29d3ef8 +Subproject commit 7512ac335846b0297e26ff3ec85dc2b1c09ec223 diff --git a/qtnetworkauth b/qtnetworkauth index 8bc6feb3..5296161d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8bc6feb36a471006cfa4b62189edc3d7fd67bf78 +Subproject commit 5296161d8089391c18520ac1fc72c8ea6ff1165b diff --git a/qtpurchasing b/qtpurchasing index 91fc2ee3..55061353 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 91fc2ee34cfd674d134e88dc7f3c54453ec685e7 +Subproject commit 55061353ee4edda62b60eba199a3f292ff4e657c diff --git a/qtqa b/qtqa index 76b891a5..3908dc23 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 76b891a51af47b2b7b6d7a1cf6deb03eab2f0699 +Subproject commit 3908dc23d77780a76d60c247c91914b9ba6cbd30 diff --git a/qtquickcontrols b/qtquickcontrols index 2785bcb8..aa3048bf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 2785bcb8f0ac04d0d2bc73b06206af1566c43958 +Subproject commit aa3048bf531f6dd3a33fb911886b64e9371bf853 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e4926383..b784d232 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e4926383bd51321e0a04a361440fca8fad557395 +Subproject commit b784d232b2f3de4624ae6dd28c3f74eeb08b2e79 diff --git a/qtremoteobjects b/qtremoteobjects index a8d2e091..3d729fab 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a8d2e0917cae57de193175f85accc109670419df +Subproject commit 3d729fabf2740af247f302c450f0bece7b85f881 diff --git a/qtscript b/qtscript index 0f93eff7..a3adc718 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 0f93eff78f1396f4d55e08b1bffaf7ce557b364f +Subproject commit a3adc71865c4d6af1c6f1eb850dec708299ae3de diff --git a/qtscxml b/qtscxml index 84bb562b..68c61e39 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 84bb562bfc1168121774d3c4b073e3e05b6efcde +Subproject commit 68c61e39f6522efa89593303f96f5805971fcbf7 diff --git a/qtserialbus b/qtserialbus index 73a56bec..387ec99c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 73a56becfeb960cfd4145bfb0ab597cd72705fa4 +Subproject commit 387ec99ce1ce91fc82f43e886aee2c0dc103da4e diff --git a/qtspeech b/qtspeech index e80a2764..fd9ba730 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit e80a2764eae65743d3d6a3195c92fd3a3fee998a +Subproject commit fd9ba730f0426d04a21db655e401e9c5cc0b8ee4 diff --git a/qtsvg b/qtsvg index b367ddfe..4048798d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b367ddfed778ac2f3ce28e39ba83bbe3c1e1437c +Subproject commit 4048798d0b9e7b86f91ebedda688dca949812163 diff --git a/qttools b/qttools index fb217099..875a927b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fb217099b4e03aaa2893e59470a4fe3ec125c9a7 +Subproject commit 875a927b49b241e6a96f2c8aace8a9c69da04ce7 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 89c1ba87..0ed673e3 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 89c1ba8732069dc73943e2ab66111cd5ed7d988d +Subproject commit 0ed673e31e292d79d1afb5d3c7e168638e654e60 diff --git a/qtwayland b/qtwayland index 993863c4..9822df54 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 993863c4527f0565a77d7728446f954732a3c2b8 +Subproject commit 9822df545cf1aaad684cb6179b214952a4027b71 diff --git a/qtwebchannel b/qtwebchannel index b376dfa4..25fb211a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b376dfa4242db85269d138f7e9a77f5bb13964b6 +Subproject commit 25fb211a32890a1bdd2b28b9727f6806a88d221c diff --git a/qtwebglplugin b/qtwebglplugin index 2f419ac8..0631c35a 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 2f419ac89db34d1d3b9ee2e6579a36dfcc36acc3 +Subproject commit 0631c35a9e5dac7b25f4e1cc55e2d196fa492740 diff --git a/qtwebsockets b/qtwebsockets index 54ffd0d0..70badedb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 54ffd0d0a3bf2c77d53e1cdfe04b362f59682cb4 +Subproject commit 70badedbf70a49c2a0de1e6b82906730abe67d3e diff --git a/qtwebview b/qtwebview index d1fc6826..e4abcccb 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d1fc6826660b8c52df4c3b0deb2ab650e0b46767 +Subproject commit e4abcccb992dec6c6b85c52a96ea7d9427da2cf7 diff --git a/qtwinextras b/qtwinextras index b9b88962..e229c061 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit b9b88962fe2f3ec23c06143129e6753ef3fd675a +Subproject commit e229c06197f3aa6ab86b1188e054a18481d026fd diff --git a/qtx11extras b/qtx11extras index 821e5be0..79e8f837 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 821e5be0cb9b87def6dbbe1b59a0a3659a2b13ea +Subproject commit 79e8f8371592fa9ff7d63841e49f362ed0bfc2b2 diff --git a/qtxmlpatterns b/qtxmlpatterns index fc214a5d..d7c7daf7 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fc214a5d298e9d916882528c43e78e386ff8b0ad +Subproject commit d7c7daf790d87e7d670846b6ccf7700368a4d7e0 From 3473922cb4bae92e582041f54e1faa196add6c4d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 27 Jun 2019 20:54:57 +0200 Subject: [PATCH 10/16] Update submodules on 'dev' in qt5 Change-Id: I2ede3578fe5d37a8df920fb9736994d25e7da47c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtscript | 2 +- qtsensors | 2 +- qtspeech | 2 +- qtwebsockets | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 9486ac48..4c03c1f6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9486ac4845173c4fec4e22aad68382eb95a48b01 +Subproject commit 4c03c1f640b6e8877990e587d46696e0fe19e312 diff --git a/qtbase b/qtbase index 5859f7d0..fc940b24 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5859f7d0d9440f82086486639a707f3935696cf4 +Subproject commit fc940b24dbe8a118e92e335c0d9c7d4194bf3d4f diff --git a/qtdeclarative b/qtdeclarative index 9834ac56..08a83f41 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9834ac56049408fbd848e364a82aabddc0815a07 +Subproject commit 08a83f41ed2f0f91968705b005775ae8147f8083 diff --git a/qtlocation b/qtlocation index 4917caeb..74079beb 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4917caebcd9e2ca92bbbad8234c887fbc1bec0ed +Subproject commit 74079bebbe44c51ab65924ee4c7e898ddf388b1c diff --git a/qtqa b/qtqa index 3908dc23..e9b796db 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3908dc23d77780a76d60c247c91914b9ba6cbd30 +Subproject commit e9b796db9c30f97056bbcdd56a152c9987bb2a43 diff --git a/qtscript b/qtscript index a3adc718..7bf3fb91 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a3adc71865c4d6af1c6f1eb850dec708299ae3de +Subproject commit 7bf3fb919d6ab212cdafd9832343b1a413eecd53 diff --git a/qtsensors b/qtsensors index 6a8e8a64..a28678b8 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6a8e8a64d3473c5ff890c022b738862a704516dc +Subproject commit a28678b83ac3a5a7530026027e2c16a23379168a diff --git a/qtspeech b/qtspeech index fd9ba730..8374f355 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit fd9ba730f0426d04a21db655e401e9c5cc0b8ee4 +Subproject commit 8374f355a1d8c488e117da1e7fefbf1e2ac28ca0 diff --git a/qtwebsockets b/qtwebsockets index 70badedb..c1b6fbfb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 70badedbf70a49c2a0de1e6b82906730abe67d3e +Subproject commit c1b6fbfb734063edb9315c109f227c90bd69fbec From 1d5641087a614f144521f9bafbffa84aba542aa5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 28 Jun 2019 23:01:12 +0200 Subject: [PATCH 11/16] Update submodules on 'dev' in qt5 Change-Id: I780c4c7d8894a4933aa908b2a90f2d1d7d069677 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtscript | 2 +- qttools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index fc940b24..1ce83264 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fc940b24dbe8a118e92e335c0d9c7d4194bf3d4f +Subproject commit 1ce832648e05ad6226071ec38a5da0ef08d3ab8e diff --git a/qtdeclarative b/qtdeclarative index 08a83f41..16289f35 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 08a83f41ed2f0f91968705b005775ae8147f8083 +Subproject commit 16289f35eb08a9b9a6d56ea8dec549b1f17e4daf diff --git a/qtmultimedia b/qtmultimedia index 7512ac33..421fa617 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7512ac335846b0297e26ff3ec85dc2b1c09ec223 +Subproject commit 421fa617369646eb99750c52a3b38fc3b3015ec6 diff --git a/qtscript b/qtscript index 7bf3fb91..3f12997d 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 7bf3fb919d6ab212cdafd9832343b1a413eecd53 +Subproject commit 3f12997d27230f0353c821d95a16cbed67d00e46 diff --git a/qttools b/qttools index 875a927b..7ecbe29c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 875a927b49b241e6a96f2c8aace8a9c69da04ce7 +Subproject commit 7ecbe29cd8149a1cf3b69305a102789ef6068b8f From 7eb00bc2c87f0a07baa5396253c168af011a9e1a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 29 Jun 2019 23:01:31 +0200 Subject: [PATCH 12/16] Update submodules on 'dev' in qt5 Change-Id: I48275cb9607bc5f7f7f4d50c5c17f2bf537b9538 Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 83686958..4f1b9f04 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 83686958db030a860a5af67c3576da25dc881fe8 +Subproject commit 4f1b9f04f1a2063df764e6ec33c9f5f2e04d1ba1 diff --git a/qtandroidextras b/qtandroidextras index 7587c6f3..fb0dc08c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 7587c6f319c00f4471e70cf913155d30d6026d49 +Subproject commit fb0dc08c88a8a1e0bae6ab5d61af9a97e63b614b diff --git a/qtbase b/qtbase index 1ce83264..e7b1c500 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1ce832648e05ad6226071ec38a5da0ef08d3ab8e +Subproject commit e7b1c500d45c8a96fb09b0b425472eb1cdb10943 diff --git a/qtconnectivity b/qtconnectivity index a628d05c..183327bc 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a628d05ced75d0666bd462f94807d3d600ca25d2 +Subproject commit 183327bc16b97276b39479e4257b112037175930 diff --git a/qtdatavis3d b/qtdatavis3d index afd72ec3..0aec1b99 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit afd72ec3dd177249fcb78683c13cae780a1a59f9 +Subproject commit 0aec1b991987f8e990ffe2d110dda5a48bdfbb12 diff --git a/qtdoc b/qtdoc index 205db431..7d4f6e7b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 205db431cad9bc40581400573d9d626f82d94052 +Subproject commit 7d4f6e7be37a0c81ebb0f2eaa896067a88ab2cb3 diff --git a/qtgamepad b/qtgamepad index 0a08df18..45ebe8e2 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 0a08df18e079f6cbb0d01a2dccea20e4a98acc50 +Subproject commit 45ebe8e27fb5ad90db0125f4e22cbd222f466082 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 86f56a81..7f05d1dd 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 86f56a816995a42cc7c1d9ade70601e3729a363e +Subproject commit 7f05d1dd2f89c50d4963308838d092a609eb9899 diff --git a/qtlocation b/qtlocation index 74079beb..d61cf78b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 74079bebbe44c51ab65924ee4c7e898ddf388b1c +Subproject commit d61cf78b33ca15880c5ba4b31e450da37bd82987 diff --git a/qtmacextras b/qtmacextras index f37e6bf9..df70f175 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit f37e6bf9fab5e326c471757d4577d52e9598ac72 +Subproject commit df70f175cc1885f9706bb41252678bea672d1b6c diff --git a/qtnetworkauth b/qtnetworkauth index 5296161d..b62e6d61 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 5296161d8089391c18520ac1fc72c8ea6ff1165b +Subproject commit b62e6d612a44f23f96f719b10de1344c3d08602d diff --git a/qtpurchasing b/qtpurchasing index 55061353..cc046e7a 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 55061353ee4edda62b60eba199a3f292ff4e657c +Subproject commit cc046e7ac58e979f2d0a4f858d71bc90f06783aa diff --git a/qtquickcontrols b/qtquickcontrols index aa3048bf..81c5d9cd 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit aa3048bf531f6dd3a33fb911886b64e9371bf853 +Subproject commit 81c5d9cde21df4ef894f8136f1e061e65ac37cfd diff --git a/qtscript b/qtscript index 3f12997d..3880777f 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 3f12997d27230f0353c821d95a16cbed67d00e46 +Subproject commit 3880777ff260a660434d36d6f63da6fd1c25d79d diff --git a/qtscxml b/qtscxml index 68c61e39..b63320b5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 68c61e39f6522efa89593303f96f5805971fcbf7 +Subproject commit b63320b5eb7296699b3ff77bf4befe73e908e04e diff --git a/qtserialbus b/qtserialbus index 387ec99c..70ab1b4e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 387ec99ce1ce91fc82f43e886aee2c0dc103da4e +Subproject commit 70ab1b4e55f95011804371d3e04764ed87eed208 diff --git a/qtsvg b/qtsvg index 4048798d..a6de6b29 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4048798d0b9e7b86f91ebedda688dca949812163 +Subproject commit a6de6b295ad99cf1830a91c9f87a359bc84658a8 diff --git a/qttools b/qttools index 7ecbe29c..b5bf195d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7ecbe29cd8149a1cf3b69305a102789ef6068b8f +Subproject commit b5bf195dc9c7576f627f37428c5ff2ff6e958411 diff --git a/qtwebglplugin b/qtwebglplugin index 0631c35a..9be2dd63 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 0631c35a9e5dac7b25f4e1cc55e2d196fa492740 +Subproject commit 9be2dd636638620c82a48e72e92efccb5ed7e673 diff --git a/qtwebsockets b/qtwebsockets index c1b6fbfb..bfe9885c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit c1b6fbfb734063edb9315c109f227c90bd69fbec +Subproject commit bfe9885c1974e9962ca3b0b88030d08a03dfa05c diff --git a/qtwebview b/qtwebview index e4abcccb..2a88e886 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e4abcccb992dec6c6b85c52a96ea7d9427da2cf7 +Subproject commit 2a88e88608eee393e23884c01aaa4ee3082a0ca3 diff --git a/qtwinextras b/qtwinextras index e229c061..3386ffc9 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e229c06197f3aa6ab86b1188e054a18481d026fd +Subproject commit 3386ffc9bd99d31c9012693e37aa3ce952074773 diff --git a/qtx11extras b/qtx11extras index 79e8f837..da824904 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 79e8f8371592fa9ff7d63841e49f362ed0bfc2b2 +Subproject commit da8249048d509e7fa6cf21d33dd96fa29aed2a70 diff --git a/qtxmlpatterns b/qtxmlpatterns index d7c7daf7..7d4cbe21 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit d7c7daf790d87e7d670846b6ccf7700368a4d7e0 +Subproject commit 7d4cbe219a44b313467c0c6f89acd713a057ecbb From 3ce3dae19b6e1fde390802950c7a6e899d4357a9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 30 Jun 2019 23:01:12 +0200 Subject: [PATCH 13/16] Update submodules on 'dev' in qt5 Change-Id: If2c839bcc7d8fd40f832854d0e729bd811187d85 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtxmlpatterns | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index e7b1c500..98f7df21 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e7b1c500d45c8a96fb09b0b425472eb1cdb10943 +Subproject commit 98f7df211464c79266e643a552d17067dd2b6c56 diff --git a/qtxmlpatterns b/qtxmlpatterns index 7d4cbe21..d32c85ca 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7d4cbe219a44b313467c0c6f89acd713a057ecbb +Subproject commit d32c85cafa29001ada3f7515a9b8f2d76164193a From c6669046b4ee94fced4555a021cc25fbabe25302 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 2 Jul 2019 23:01:03 +0200 Subject: [PATCH 14/16] Update submodules on 'dev' in qt5 Change-Id: Ib8778d70ad087c95d92998ae533c6e3fb2412d6a Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtnetworkauth | 2 +- qttools | 2 +- qtwebglplugin | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 4f1b9f04..8d191720 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4f1b9f04f1a2063df764e6ec33c9f5f2e04d1ba1 +Subproject commit 8d1917209a04286b2befbaff7d8e0ed5256fb232 diff --git a/qtbase b/qtbase index 98f7df21..53428059 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 98f7df211464c79266e643a552d17067dd2b6c56 +Subproject commit 5342805920064dfe64c23690cd1d895a95478154 diff --git a/qtdeclarative b/qtdeclarative index 16289f35..64c1fbe9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 16289f35eb08a9b9a6d56ea8dec549b1f17e4daf +Subproject commit 64c1fbe96c68b1286a70242ff4922be140128cb2 diff --git a/qtnetworkauth b/qtnetworkauth index b62e6d61..e4a3b0c4 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit b62e6d612a44f23f96f719b10de1344c3d08602d +Subproject commit e4a3b0c4558b37d82f9292e12325089330dee5cd diff --git a/qttools b/qttools index b5bf195d..199329c9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b5bf195dc9c7576f627f37428c5ff2ff6e958411 +Subproject commit 199329c9df889d371dc5f717248fcc519e8952e3 diff --git a/qtwebglplugin b/qtwebglplugin index 9be2dd63..e80c1bf2 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 9be2dd636638620c82a48e72e92efccb5ed7e673 +Subproject commit e80c1bf24039ff36ff874f313be53ac2a70029de From ff74cdbe968edca1212691be966f2054a4587f1c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 Jul 2019 23:01:17 +0200 Subject: [PATCH 15/16] Update submodules on 'dev' in qt5 Change-Id: I2bbb20be92c15de518f3c361cffbe2a2f0150c4c Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qttools | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 53428059..f7090544 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5342805920064dfe64c23690cd1d895a95478154 +Subproject commit f70905448f612f52d4c3034faee61fc103b9eb7c diff --git a/qtdeclarative b/qtdeclarative index 64c1fbe9..1f01b44d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 64c1fbe96c68b1286a70242ff4922be140128cb2 +Subproject commit 1f01b44d20471a7f4a5029a4c0049e8296749fef diff --git a/qtimageformats b/qtimageformats index 9a4a2dd5..633f77e8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9a4a2dd5189e1659bce46eacef513b0c5680bb1e +Subproject commit 633f77e8e980996b095102ed462ffd228291b7fe diff --git a/qtlocation b/qtlocation index d61cf78b..a0cc254c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d61cf78b33ca15880c5ba4b31e450da37bd82987 +Subproject commit a0cc254c5b0a300772bba886b48b73929636c281 diff --git a/qtremoteobjects b/qtremoteobjects index 3d729fab..c9243cb8 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3d729fabf2740af247f302c450f0bece7b85f881 +Subproject commit c9243cb82e991b4f97872282b91b64b512101738 diff --git a/qtserialbus b/qtserialbus index 70ab1b4e..533027e8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 70ab1b4e55f95011804371d3e04764ed87eed208 +Subproject commit 533027e8bbc17bf39f74ef99edeb395c25d80ab4 diff --git a/qttools b/qttools index 199329c9..f7a50cab 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 199329c9df889d371dc5f717248fcc519e8952e3 +Subproject commit f7a50cab668c27ab8e17be96add02e515e9b1681 From d49ae7020c0f5a1de0dbba469234ea4198e8f8fb Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Mon, 24 Jun 2019 08:03:11 +0000 Subject: [PATCH 16/16] Revert "Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)"" This reverts commit 84ff024609e4eca003c604294b4102e73deba8c3. Reason for revert: Change-Id: Iad753c1c4728c6eddc53816e2c51947ce724bf6b Reviewed-by: Volker Hilsheimer --- coin/provisioning/common/windows/docker.ps1 | 85 ------------------- .../qtci-windows-10-x86_64/95-docker.ps1 | 6 -- 2 files changed, 91 deletions(-) delete mode 100644 coin/provisioning/common/windows/docker.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 diff --git a/coin/provisioning/common/windows/docker.ps1 b/coin/provisioning/common/windows/docker.ps1 deleted file mode 100644 index 6f53eccd..00000000 --- a/coin/provisioning/common/windows/docker.ps1 +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################# -## -## 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 installs Docker tool kits and Apple Bonjour on Windows. - -function DownloadAndInstall -{ - Param ( - [string]$externalUrl, - [string]$internalUrl, - [string]$package, - [string]$sha1, - [string]$parameters - ) - - Write-Host "Fetching $package from URL..." - Download $externalUrl $internalUrl $package - Verify-Checksum $package $sha1 - - Write-Host "Installing $package..." - Run-Executable $package $parameters - - Write-Host "Remove $package..." - Remove-Item -Path $package -} - -# Install Docker Toolbox -$package = Get-DownloadLocation "DockerToolbox.exe" -$externalUrl = "https://download.docker.com/win/stable/DockerToolbox.exe" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.exe" -$sha1 = "62325c426ff321d9ebfb89664d65cf9ffaef2985" -DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/SP- /SILENT" -Add-Path 'C:\Program Files\Docker Toolbox' -docker --version -docker-compose --version - -# Install Apple Bonjour -$package = Get-DownloadLocation "BonjourPSSetup.exe" -$externalUrl = "http://support.apple.com/downloads/DL999/en_US/BonjourPSSetup.exe" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/BonjourPSSetup.exe" -$sha1 = "847f39e0ea80d2a4d902fe59657e18f5bc32a8cb" -DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/qr" - -# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support -$testserver = "$PSScriptRoot\..\shared\testserver\docker_testserver.sh" -$sysInfoStr = systeminfo -if ($sysInfoStr -like "*A hypervisor has been detected*") { - & 'C:\Program Files\Git\bin\bash.exe' --login $testserver Hyper-V -} elseif ($sysInfoStr -like "*Virtualization Enabled In Firmware: Yes*") { - & 'C:\Program Files\Git\bin\bash.exe' --login $testserver VMX -} else { - Write-Error "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." -} diff --git a/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 deleted file mode 100644 index df735855..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/95-docker.ps1 +++ /dev/null @@ -1,6 +0,0 @@ -# Disable Hyper-V from Windows 10 Pro/Enterprise -# Because VirtualBox is a type 2 hypervisor, it can't run if Hyper-V virtual machines are in use. -# Otherwise, docker-machine will complain about "VT-x is not available (VERR_VMX_NO_VMX)". -Disable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V-All -NoRestart - -. "$PSScriptRoot\..\common\windows\docker.ps1"