From 97aa262db53ca6982482b7a0f595351d1f5e5b2f Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 28 Apr 2021 11:43:37 +0300 Subject: Provisioning: Upgrade python 3.6 version to 3.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit typing.NoReturn is not included in python 3.6.1 version. We need at least 3.6.2 version Task-number: QTQAINFRA-4433 Change-Id: I040e72e253852c7789d4f9e781d18e6b9a431a50 Reviewed-by: Dan Ackers Reviewed-by: Tony Sarajärvi (cherry picked from commit 6ae5052d57ad2438813a5d824ef601aab8c06935) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-windows-10-x86/08-python3.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 index 9446a32f..8c45be0e 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 @@ -5,4 +5,4 @@ # - version # - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36" "3.6.1" $true +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36" "3.6.2" $true diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 index 0ab0ed39..401a5ada 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 @@ -8,5 +8,5 @@ . "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" . "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" # default ones -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bf54252c4065b20f4a111cc39cf5215fb1edccff" "C:\Python36" "3.6.1" $true -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36_32" "3.6.1" $true +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bcf9bda733a9153811209c62d628c41ab6cedbe2" "C:\Python36" "3.6.2" $true +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36_32" "3.6.2" $true -- cgit v1.2.3 From 838d1d887db4bca23aa8e7f4771b8c706e53fbce Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 28 Apr 2021 21:10:19 +0300 Subject: Update submodules on '6.0' in qt/qt5 Change-Id: I2fa6c689d8c8f87045866c8f1fed7c9648c0acec Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index be973b7e..4af6a9a4 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit be973b7ee7a93dcc13b61f773f25a0c1f9fee0db +Subproject commit 4af6a9a44cbdd268d33d56088a01a99ea7d64c39 diff --git a/qtbase b/qtbase index 73621cbf..38564297 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 73621cbf0a5f53990b2c7a966bc6fd71299ec8fe +Subproject commit 38564297e778f2197ceb1d829741192d44bb6082 diff --git a/qtdeclarative b/qtdeclarative index 77fd3a09..2dc65c9a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 77fd3a0969e05f3741307afef8721aba7ee6c8c0 +Subproject commit 2dc65c9ae22bc54e977f3686b18484d448eff636 diff --git a/qtdoc b/qtdoc index 9fc3cc14..69177f3c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9fc3cc14f34861a94507d9d8bdbe1f5f64a21556 +Subproject commit 69177f3c2a5e7b79d45efb1b76a54f3148eb9591 diff --git a/qtquick3d b/qtquick3d index 28087235..beb7964f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 28087235acfbcffb4172acaa06227244bc9fa75b +Subproject commit beb7964f8cfbacefe1e6542bfbc3b8280036235d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3b4f4a5d..5806aede 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3b4f4a5d4f70f35e256260cc4b5d6cae9c0dad66 +Subproject commit 5806aededc5792013ece47610e9875062c45ab18 diff --git a/qtquicktimeline b/qtquicktimeline index f1e06e4a..62a93975 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit f1e06e4a16c8ae9ee97b655da32fa08039514163 +Subproject commit 62a93975410c23bfbd337a569de494e6fdfd5b09 diff --git a/qtshadertools b/qtshadertools index 227f6a97..6317df54 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 227f6a9706eaccc41641873be01f406ba11ab708 +Subproject commit 6317df54e5ee5047bd7214efc88abdf08d71194b diff --git a/qtsvg b/qtsvg index f1a74f5e..8beca23c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f1a74f5e68fc366259087ccd85ddf8087e89d265 +Subproject commit 8beca23c87ed1949cb2efa7b01dc62c2a68e6082 diff --git a/qttools b/qttools index ec8d842b..d8467008 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ec8d842b35032d41a2cd32689d5e83c1133f681c +Subproject commit d8467008dfb027d9f28fdc71dcffe4f53c69c624 diff --git a/qttranslations b/qttranslations index 83503740..4ca1855d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 83503740913a3e095eef6a996b157297fc75a30e +Subproject commit 4ca1855dcaeb86f5dd3da6a7d92053474cca4675 diff --git a/qtwayland b/qtwayland index 3d4cee05..b154071b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3d4cee05a5642fdd6f1d43ff36cc53c5028a8966 +Subproject commit b154071beaacc6d69766844e1ce07f954042aa4c -- cgit v1.2.3 From 413b4a7c3c7cff466b1ea4fff75765e51a976207 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 29 Apr 2021 07:19:02 +0300 Subject: Update submodules on '6.0' in qt/qt5 Change-Id: I9be268d0f046428a345d103fd2775030e87aa83e Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index 4af6a9a4..d32d2080 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 4af6a9a44cbdd268d33d56088a01a99ea7d64c39 +Subproject commit d32d20806bb84b40f9d50ddb483cdf82da800a9d diff --git a/qtbase b/qtbase index 38564297..9c1b3958 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 38564297e778f2197ceb1d829741192d44bb6082 +Subproject commit 9c1b395860e7e25062e7609fccc43819e938f315 diff --git a/qtdeclarative b/qtdeclarative index 2dc65c9a..0314aded 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2dc65c9ae22bc54e977f3686b18484d448eff636 +Subproject commit 0314adede43b1b03d0575d66c2bed3c2da4a7d9c diff --git a/qtdoc b/qtdoc index 69177f3c..0575eead 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 69177f3c2a5e7b79d45efb1b76a54f3148eb9591 +Subproject commit 0575eead7f9211153aa2e6aedb4c30c0b44cbe56 diff --git a/qtqa b/qtqa index 7e0965cb..47066461 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 7e0965cb004e6e4cea7746b838fbd6334ea61d09 +Subproject commit 47066461763f0d7fa2aba27e57553f00bc1967bf diff --git a/qtquick3d b/qtquick3d index beb7964f..85967d11 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit beb7964f8cfbacefe1e6542bfbc3b8280036235d +Subproject commit 85967d113500493842140254d956728eee5ad0eb diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5806aede..d3367487 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5806aededc5792013ece47610e9875062c45ab18 +Subproject commit d3367487b82dcfa01bf9e8a73806840404bf0ea4 diff --git a/qtquicktimeline b/qtquicktimeline index 62a93975..184f8859 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 62a93975410c23bfbd337a569de494e6fdfd5b09 +Subproject commit 184f8859c50fc427f546969613ac631e5a9e15ab diff --git a/qtshadertools b/qtshadertools index 6317df54..d8cf1966 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 6317df54e5ee5047bd7214efc88abdf08d71194b +Subproject commit d8cf1966f1c970566aa2d3a6d4ad922d62c8e8dd diff --git a/qtsvg b/qtsvg index 8beca23c..fe7f86a4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 8beca23c87ed1949cb2efa7b01dc62c2a68e6082 +Subproject commit fe7f86a4f2e505eeb03757028a7179868f9de2d0 diff --git a/qttools b/qttools index d8467008..60f08d35 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d8467008dfb027d9f28fdc71dcffe4f53c69c624 +Subproject commit 60f08d352a7dd4d1b0d7a2b8b5973739d4803be4 diff --git a/qttranslations b/qttranslations index 4ca1855d..ee39411f 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 4ca1855dcaeb86f5dd3da6a7d92053474cca4675 +Subproject commit ee39411f550319fc3858446b76d09fb6e6879395 diff --git a/qtwayland b/qtwayland index b154071b..fc656f25 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b154071beaacc6d69766844e1ce07f954042aa4c +Subproject commit fc656f25d0086bfadefdb3586f9fa6968c44889c -- cgit v1.2.3