Merge branch 6.0 into pyside6.0

Change-Id: I87f75e6ca71775b4d1fa779e804921dc932b2f80

15 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
diff --git a/qt5compat b/qt5compat
-Subproject be973b7ee7a93dcc13b61f773f25a0c1f9fee0d
+Subproject d32d20806bb84b40f9d50ddb483cdf82da800a9
diff --git a/qtbase b/qtbase
-Subproject 73621cbf0a5f53990b2c7a966bc6fd71299ec8f
+Subproject 9c1b395860e7e25062e7609fccc43819e938f31
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 77fd3a0969e05f3741307afef8721aba7ee6c8c
+Subproject 0314adede43b1b03d0575d66c2bed3c2da4a7d9
diff --git a/qtdoc b/qtdoc
-Subproject 9fc3cc14f34861a94507d9d8bdbe1f5f64a2155
+Subproject 0575eead7f9211153aa2e6aedb4c30c0b44cbe5
diff --git a/qtqa b/qtqa
-Subproject 7e0965cb004e6e4cea7746b838fbd6334ea61d0
+Subproject 47066461763f0d7fa2aba27e57553f00bc1967b
diff --git a/qtquick3d b/qtquick3d
-Subproject 28087235acfbcffb4172acaa06227244bc9fa75
+Subproject 85967d113500493842140254d956728eee5ad0e
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 3b4f4a5d4f70f35e256260cc4b5d6cae9c0dad6
+Subproject d3367487b82dcfa01bf9e8a73806840404bf0ea
diff --git a/qtquicktimeline b/qtquicktimeline
-Subproject f1e06e4a16c8ae9ee97b655da32fa0803951416
+Subproject 184f8859c50fc427f546969613ac631e5a9e15a
diff --git a/qtshadertools b/qtshadertools
-Subproject 227f6a9706eaccc41641873be01f406ba11ab70
+Subproject d8cf1966f1c970566aa2d3a6d4ad922d62c8e8d
diff --git a/qtsvg b/qtsvg
-Subproject f1a74f5e68fc366259087ccd85ddf8087e89d26
+Subproject fe7f86a4f2e505eeb03757028a7179868f9de2d
diff --git a/qttools b/qttools
-Subproject ec8d842b35032d41a2cd32689d5e83c1133f681
+Subproject 60f08d352a7dd4d1b0d7a2b8b5973739d4803be
diff --git a/qttranslations b/qttranslations
-Subproject 83503740913a3e095eef6a996b157297fc75a30
+Subproject ee39411f550319fc3858446b76d09fb6e687939
diff --git a/qtwayland b/qtwayland
-Subproject 3d4cee05a5642fdd6f1d43ff36cc53c5028a896
+Subproject fc656f25d0086bfadefdb3586f9fa6968c44889