From 23560769c1293f7cd7754ed916db2eea42efbd32 Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Tue, 14 Aug 2018 10:39:23 +0200 Subject: [PATCH 01/10] Provisioning: Update QEMU toolchains of boot2qt Docker-based test server needs mdns to resolve .local while testing qt network stack in CI. Otherwise the tests would not see announced services. Relates to yocto/meta-boot2qt 7608ebe44f65f4d525081cf9a5b12cfa05792a8f Change-Id: If834b01668bcf844e475e863eb1337849c718270 Reviewed-by: Samuli Piippo --- .../qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh index 434b832f..fbe669d9 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh @@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Installing Yocto toolchain for 32-bit b2qt..." versionARM="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-2f17ab3.sh" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="7cd306769f79a202b6528d12e12f75eac4672748" +SHA1="db7a0f4f9ddd5992a563d5348889021a7ceb1c56" yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" yoctoLocationARMv7="/opt/yocto-armv7" sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi" @@ -61,10 +61,10 @@ rm -rf "$yoctoInstaller" echo "Installing Yocto toolchain for 64-bit b2qt..." versionARM64="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-2f17ab3.sh" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="f7219a26192af772743a8fe9c5cb6168e42d68f1" +SHA1="5dcae7c6cbc266798ba49a9e51fff1f06790729d" yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" yoctoLocationARM64="/opt/yocto-arm64" sysrootARM64="sysroots/aarch64-poky-linux" From 726cfcb37672ce3f46048078a8140f78cb0b6da7 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 12 Aug 2018 20:17:42 +0200 Subject: [PATCH 02/10] Update submodules on 'dev' in qt5 Exclude qtbase in this round. Change-Id: I5cc23b431b7a02ad81bba67af3b124b169f02507 Reviewed-by: Liang Qi --- qtconnectivity | 2 +- qtdeclarative | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtconnectivity b/qtconnectivity index b6edd379..bc0a27c4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b6edd379204221bf9848b3648106e56c7c2cd7e6 +Subproject commit bc0a27c40a588f005059f9bf0ca38915e7270959 diff --git a/qtdeclarative b/qtdeclarative index 32f93f08..c7ec614a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 32f93f087dac5ed73ca1c19dbee4059e026bc3da +Subproject commit c7ec614a8443a559a722b83ccf1c370fb1ee5a42 diff --git a/qtwebengine b/qtwebengine index 80f42a09..0358558a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 80f42a0955365d641d7ca6cb5e99d0a8252a543e +Subproject commit 0358558a3a22c0fdb586de95e4c48bced96ff6c5 From ab25e989b1e08a85eaab75a6d647fa9efdbbcf55 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 15 Aug 2018 10:09:10 +0200 Subject: [PATCH 03/10] Update submodules on 'dev' in qt5 Exclude qtbase in this round. Change-Id: I9b781f1add1dea2723e799928db253720b1f2bbd Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 0f813d7f..4bbc782f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0f813d7f28bacdd71ba2540946a801cf44e40a73 +Subproject commit 4bbc782fc70f30e8b1530e87c85a8f453deb051d diff --git a/qtconnectivity b/qtconnectivity index bc0a27c4..3eb77fc4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit bc0a27c40a588f005059f9bf0ca38915e7270959 +Subproject commit 3eb77fc4a0a9f8403baaa2a33aad9c0ef4802cb7 diff --git a/qtdeclarative b/qtdeclarative index c7ec614a..bdeaef72 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c7ec614a8443a559a722b83ccf1c370fb1ee5a42 +Subproject commit bdeaef727230b6e820b202828e06503dac8096d6 diff --git a/qtlocation b/qtlocation index 07be65e9..a915ceef 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 07be65e9d9a883aab4e1fda367cf591b7cb97631 +Subproject commit a915ceeff0ab11c93621f39cc1f08bc418c5ec01 diff --git a/qtqa b/qtqa index 6dc5301b..509c0bd2 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 6dc5301b5ba37b05711c89ac9d761c75d793f35b +Subproject commit 509c0bd23590e0e39189ed96448263fa248aac67 diff --git a/qtremoteobjects b/qtremoteobjects index 6f781fd2..8761c1a2 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6f781fd266caa1e268e167f7273fec3e30d5af7a +Subproject commit 8761c1a282f596a64e0fc624c87added43fb47d8 diff --git a/qtsvg b/qtsvg index 524478f6..bb80aeee 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 524478f60e6eac991b9ef033a2030a9ea5aa5c36 +Subproject commit bb80aeee1fb19445889210ec913046d0ca385721 diff --git a/qtwayland b/qtwayland index 61734175..4d0ae358 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 617341751630be295f9e3dc0a9ea630de61ee345 +Subproject commit 4d0ae358dd646c369829bb38c099eb47bd04db4a diff --git a/qtwebengine b/qtwebengine index 0358558a..b74e93a9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0358558a3a22c0fdb586de95e4c48bced96ff6c5 +Subproject commit b74e93a9b07243da4f3d2784cde49916de455364 diff --git a/qtwebsockets b/qtwebsockets index 85e345a3..49c06ead 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 85e345a38709026d4d82c67b9016338675851249 +Subproject commit 49c06eadaada1e040d78d353ad42ad19ad86d3d3 From 02b7a0b984b22840d6355a021d48b7d47b5be029 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 16 Aug 2018 14:10:31 +0200 Subject: [PATCH 04/10] Update submodules on 'dev' in qt5 Change-Id: Ibe68c18b979b20890cfcbfdbedb1620f7914bba4 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index ee2e3849..1a350077 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ee2e38490d51667e878ed1732df387a6d9f2a5fe +Subproject commit 1a350077ff6aae315b87f220276f3fba8038d93d diff --git a/qtconnectivity b/qtconnectivity index 3eb77fc4..a0ade068 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3eb77fc4a0a9f8403baaa2a33aad9c0ef4802cb7 +Subproject commit a0ade068004ad869d6235ae8d6cd5e2050bf765d diff --git a/qtdeclarative b/qtdeclarative index bdeaef72..c9d1fd90 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bdeaef727230b6e820b202828e06503dac8096d6 +Subproject commit c9d1fd90612485ae296fbefc36969f2bbcea84fa diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 628df388..ebfcc404 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 628df3881fbb3d3bd1ee4316b47df5871c6dad73 +Subproject commit ebfcc404a172160baccd67fa72f8199b78ff5141 diff --git a/qtwayland b/qtwayland index 4d0ae358..bc9389ab 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4d0ae358dd646c369829bb38c099eb47bd04db4a +Subproject commit bc9389aba6575a739ccbb7de9c921439d9d6f246 From 530a923e68d18e56741346ae5abec62a304fe4e9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 17 Aug 2018 07:46:29 +0200 Subject: [PATCH 05/10] Update submodules on 'dev' in qt5 Change-Id: Ibc222c15fe9a02dd4ed34fb3cd4724180bb45680 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtremoteobjects | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 1a350077..0f6b941c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1a350077ff6aae315b87f220276f3fba8038d93d +Subproject commit 0f6b941ca54f9714627b8d5a94be163dc02126c1 diff --git a/qtconnectivity b/qtconnectivity index a0ade068..c0960600 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a0ade068004ad869d6235ae8d6cd5e2050bf765d +Subproject commit c0960600bad55c5df62ba26a78d08179658b0454 diff --git a/qtdeclarative b/qtdeclarative index c9d1fd90..9fbdc8c4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c9d1fd90612485ae296fbefc36969f2bbcea84fa +Subproject commit 9fbdc8c4c2c028427b19907d636a7a83d79cbd09 diff --git a/qtlocation b/qtlocation index a915ceef..f0472774 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a915ceeff0ab11c93621f39cc1f08bc418c5ec01 +Subproject commit f0472774b36c862f5fb6822f2d4d63a967d1eaec diff --git a/qtremoteobjects b/qtremoteobjects index 8761c1a2..e170cbe4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 8761c1a282f596a64e0fc624c87added43fb47d8 +Subproject commit e170cbe42b8f654894e4035c8ddfd6759a034be8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 246c406f..e803aec1 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 246c406fc2bad945284704bb6613ae9adf3230ed +Subproject commit e803aec1ea21fd00e13b9535a4b536cc43c26ee4 diff --git a/qtwayland b/qtwayland index bc9389ab..bc9fc09c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bc9389aba6575a739ccbb7de9c921439d9d6f246 +Subproject commit bc9fc09caf4f638005977281dc57e7d9c99cfddf diff --git a/qtwebsockets b/qtwebsockets index 49c06ead..39a0e9bb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 49c06eadaada1e040d78d353ad42ad19ad86d3d3 +Subproject commit 39a0e9bb5a3e87522bfe4a3107560fd6ef7632b4 diff --git a/qtxmlpatterns b/qtxmlpatterns index e95c186f..b9b94194 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e95c186fe8da96fba394490f9bca817534124b63 +Subproject commit b9b941945dc63a48652576c806e10dfeb15005e9 From 50ef5744f534aa20c073774e8e46036919ff1936 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 17 Aug 2018 07:49:41 +0000 Subject: [PATCH 06/10] Update submodules on 'dev' in qt5 Change-Id: I3968edabb171ffaf9d498f8aaad90843a04fb9ee Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtserialbus | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 0f6b941c..67352c92 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0f6b941ca54f9714627b8d5a94be163dc02126c1 +Subproject commit 67352c92761fcb2e2c6a98b24e1bf5f33805cb3a diff --git a/qtconnectivity b/qtconnectivity index c0960600..0f930cdd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c0960600bad55c5df62ba26a78d08179658b0454 +Subproject commit 0f930cddefe386c6b6f65b8b11342c9e76876a9b diff --git a/qtserialbus b/qtserialbus index 34d346c1..9f5b14b0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 34d346c161bf89a6a98d4782627a5c4f12271bde +Subproject commit 9f5b14b06775e91ac65dc3c0b0ea3a54235a93a2 From 21b3591580093f14db9824d485f500b4c50e2e40 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 15 Aug 2018 13:12:07 +0200 Subject: [PATCH 07/10] Provisioning: Update MQTT broker Required to get shared subscription testing working, namely to fix https://github.com/eclipse/paho.mqtt.testing/issues/56 Change-Id: Ib8657cde0d8e33135bbc2ebcb9558f8e6b13e40f Reviewed-by: Oliver Wolff --- coin/provisioning/common/unix/mqtt_broker.sh | 4 ++-- coin/provisioning/common/windows/mqtt_broker.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index 2d79c77b..22a9a66a 100644 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -39,10 +39,10 @@ source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -CommitSHA="5e14a65bbf602fe5d58afdd1394ce76d41ed5c65" +CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e" PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" -SHA1="6afc375c2702eb36a960f38dd4912a3422d679fd" +SHA1="a0ac88715c2aebb9573a113dc13925a90da19233" targetFolder="/opt/paho_broker" appPrefix="paho.mqtt.testing-$CommitSHA" diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 index f362f55c..e37994c9 100644 --- a/coin/provisioning/common/windows/mqtt_broker.ps1 +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 @@ -35,8 +35,8 @@ Write-Host "MQTT: Downloading Paho test broker..." $zip = Get-DownloadLocation "pahotest.zip" -$commitSHA = "5e14a65bbf602fe5d58afdd1394ce76d41ed5c65" -$sha1 = "6afc375c2702eb36a960f38dd4912a3422d679fd" +$commitSHA = "20bad2475c27a6e1d24a56d90a9fceb40963261e" +$sha1 = "a0ac88715c2aebb9573a113dc13925a90da19233" $internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip" $externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip" From 6077565b3ec70c1fb334801543b0894914cb0e06 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 10 Aug 2018 14:43:35 +0300 Subject: [PATCH 08/10] Provisioning: openSUSE_42.3: Wait for PackageKit to finish Provisioning sometimes fails if PackageKit is locked at the moment we try to remove plasma5-pk-updates package. Task-number: QTQAINFRA-2141 Change-Id: I5e6c2ecab87033ce01aae915813e1d5f70ea8186 Reviewed-by: Heikki Halmet --- .../qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index 4c1361b7..61c19510 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -19,9 +19,15 @@ echo "Set DISPLAY" echo 'export DISPLAY=":0"' >> ~/.bashrc echo "Disabling file indexing." sudo balooctl disable -echo "Disable update notifications" + +while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do + echo "Waiting for PackageKit to finish..." + sleep 0.5 +done +echo "Disabling update notifications" sudo zypper -nq remove plasma5-pk-updates + # shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy From 42f4bdd05173283f2f74a27e815ed00fd7497a49 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 20 Aug 2018 10:21:14 +0200 Subject: [PATCH 09/10] Update submodules on 'dev' in qt5 Change-Id: I15b2964fb22fdac38f172b2a24852fb90a255649 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebsockets | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index db836a41..ebd195c5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit db836a410555108adff3bd594cf75f4174069f0c +Subproject commit ebd195c59fe50c49dd28f27828afa802384d7011 diff --git a/qtbase b/qtbase index 67352c92..346c1510 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 67352c92761fcb2e2c6a98b24e1bf5f33805cb3a +Subproject commit 346c15102b14c58b8aaeed2c1586cd3100200e28 diff --git a/qtconnectivity b/qtconnectivity index 0f930cdd..05cad850 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0f930cddefe386c6b6f65b8b11342c9e76876a9b +Subproject commit 05cad85003f5bdb15834fe4eb651fdcc57874364 diff --git a/qtdeclarative b/qtdeclarative index 9fbdc8c4..87a4d4ba 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9fbdc8c4c2c028427b19907d636a7a83d79cbd09 +Subproject commit 87a4d4babe0a3d6b8a57048205eccc7105931474 diff --git a/qtdoc b/qtdoc index fc581c25..32365621 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit fc581c25729d97693d0409420745095773436806 +Subproject commit 3236562180cfa298ed16525b2a1d2757f514a14c diff --git a/qtlocation b/qtlocation index f0472774..0a9ef379 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f0472774b36c862f5fb6822f2d4d63a967d1eaec +Subproject commit 0a9ef37972aed19ec4451d0a0e24bfacc56bded3 diff --git a/qtmultimedia b/qtmultimedia index 6dda96f4..ec597d89 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6dda96f4d4681f7107931bea4c5a0f3fc35bec8d +Subproject commit ec597d89320dd312382457a711ebddb085b16a59 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ebfcc404..b88941e6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ebfcc404a172160baccd67fa72f8199b78ff5141 +Subproject commit b88941e62c533474f4658a212133089e04863673 diff --git a/qttools b/qttools index 6e60c31d..bc7ed4f1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6e60c31d3513da3a9ec5e9a38326961bc6a32928 +Subproject commit bc7ed4f112c85ac9db5a4126eb446591e0283bc3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e803aec1..9463ad7c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e803aec1ea21fd00e13b9535a4b536cc43c26ee4 +Subproject commit 9463ad7c01c8cda0af27d9ec0692a61af171d29e diff --git a/qtwayland b/qtwayland index bc9fc09c..c7e775ae 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bc9fc09caf4f638005977281dc57e7d9c99cfddf +Subproject commit c7e775aef78b655666916bba15196c89dbf0b43d diff --git a/qtwebsockets b/qtwebsockets index 39a0e9bb..790586e4 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 39a0e9bb5a3e87522bfe4a3107560fd6ef7632b4 +Subproject commit 790586e42920a4cbf10bb808aa1b716247628cc4 From 92088b295cb5decbcedf0b2d1446d3f27d5f1e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 8 Aug 2018 14:46:53 +0300 Subject: [PATCH 10/10] Upgrade Xcode to 9.4.1 Task-number: QTQAINFRA-2136 Change-Id: I57f64c3dc3b91f21bb6d42ab5dc5163db75120b9 Reviewed-by: Liang Qi --- coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh | 2 +- .../qtci-macos-10.13-x86_64/21-install-commandlinetools.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh index 7d21f507..edcb2345 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.3.1.tar.gz 9.3.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.4.1.tar.gz 9.4.1 diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh index 2972f402..ecd1bee4 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh @@ -37,10 +37,10 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="9.3" +version="9.4.1" packageName="Command_Line_Tools_macOS_10.13_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/$packageName" -sha1="3c0306d3faa1131550f1539feeeb5aa6c985763a" +sha1="efe51c11c2c99a5f1a98bbd3772dc3fa3ce78904" InstallCommandLineTools $url $url $sha1 $packageName $version