Merge commit 'b021c416b50598dd8da6e7099318ab4b31b6e3ab' into pyside6.0

Change-Id: I3ca531ac8f6b72d6d2ad4e28522b3ef4ab8e8f80

23 files changed, 37 insertions, 12 deletions

diff --git a/.gitmodules b/.gitmodules
index 56de35ea..5d8584a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -124,13 +124,13 @@
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.0
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
@@ -277,8 +277,8 @@
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
-	status = ignore
+	branch = 6.0
+	status = additionalLibrary
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -323,3 +323,21 @@
 	url = ../qt5compat.git
 	branch = 6.0
 	status = deprecated
+[submodule "qtcoap"]
+	depends = qtbase qttools
+	path = qtcoap
+	url = ../qtcoap.git
+	branch = 6.0
+	status = additionalLibrary
+[submodule "qtmqtt"]
+	depends = qtbase qtdeclarative qttools
+	path = qtmqtt
+	url = ../qtmqtt.git
+	branch = 6.0
+	status = additionalLibrary
+[submodule "qtopcua"]
+	depends = qtbase qtdeclarative qtquickcontrols2 qttools
+	path = qtopcua
+	url = ../qtopcua.git
+	branch = 6.0
+	status = additionalLibrary
diff --git a/coin/provisioning/qtci-windows-10-x86/90-squish.ps1 b/coin/provisioning/qtci-windows-10-x86/90-squish.ps1
deleted file mode 100644
index ff758845..00000000
--- a/coin/provisioning/qtci-windows-10-x86/90-squish.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\squishInstall.ps1"
diff --git a/init-repository b/init-repository
index 81c9bb74..2bef9979 100755
--- a/init-repository
+++ b/init-repository
@@ -72,11 +72,14 @@ Options:
         Only initialize the specified subset of modules given as the
         argument. Specified modules must already exist in .gitmodules. The
         string "all" results in cloning all known modules. The strings
-        "essential", "addon", "preview", "deprecated", "obsolete", and
-        "ignore" refer to classes of modules; "default" maps to
-        "essential,addon,preview,deprecated", which corresponds with the
-        set of maintained modules and is also the default set. Module
-        names may be prefixed with a dash to exclude them from a bigger
+        "essential", "addon", "preview", "deprecated", "obsolete",
+        "additionalLibrary", and "ignore" refer to classes of modules
+        identified by "status=" lines in the .gitmodules file.
+        You can use "default" in the subset as a short-hand for
+        "essential,addon,preview,deprecated", which corresponds to the set of
+        maintained modules included in standard Qt releases; this is also the
+        default module subset when this option is not given. Entries
+        may be prefixed with a dash to exclude them from a bigger
         set, e.g. "all,-ignore".
 
     --no-update
@@ -294,7 +297,8 @@ use constant {
     STS_ESSENTIAL => 2,
     STS_ADDON => 3,
     STS_DEPRECATED => 4,
-    STS_OBSOLETE => 5
+    STS_OBSOLETE => 5,
+    STS_ADDITIONAL => 6
 };
 
 sub git_clone_all_submodules
@@ -332,6 +336,8 @@ sub git_clone_all_submodules
                 $subinits{$1} = STS_DEPRECATED;
             } elsif ($3 eq "obsolete") {
                 $subinits{$1} = STS_OBSOLETE;
+            } elsif ($3 eq "additionalLibrary") {
+                $subinits{$1} = STS_ADDITIONAL;
             } elsif ($3 eq "ignore") {
                 delete $subinits{$1};
             } else {
@@ -351,6 +357,8 @@ sub git_clone_all_submodules
             @what = grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases;
         } elsif ($mod eq "addon") {
             @what = grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
+        } elsif ($mod eq "additionalLibrary") {
+            @what = grep { ($subinits{$_} || 0) eq STS_ADDITIONAL } keys %subbases;
         } elsif ($mod eq "preview") {
             @what = grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
         } elsif ($mod eq "deprecated") {
@@ -641,7 +649,7 @@ sub run
     die("Have no origin remote.\n") if (!$url);
     $url =~ s,\.git$,,;
     $url =~ s/((?:tqtc-)?qt5)$//;
-    my $qtrepo = $1 or 'qt5';
+    my $qtrepo = $1 || 'qt5';
     $self->{'base-url'} = $url;
 
     $self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}});
diff --git a/qt3d b/qt3d
-Subproject e046a40b74ba9d25f1c73165b74eb805e330ff8
+Subproject 729697ebe240ef40f532a921a5be6c9f0108387
diff --git a/qt5compat b/qt5compat
-Subproject 739d144cba52bdba738c14de41c45659bddf8ab
+Subproject 130c9cb7ebf53420f665293fb6e8de65d4ce9a6
diff --git a/qtbase b/qtbase
-Subproject 723077eb3529810aa3b99d8c06f9b81a586763c
+Subproject 0ff1dc7110d373c85ce41e90073291b5e2eb16a
diff --git a/qtcoap b/qtcoap
new file mode 160000
+Subproject 618c330f084f9a60d56f20003197b66d7d64ec1
diff --git a/qtdeclarative b/qtdeclarative
-Subproject da46b97ed5a56ce3db8e903053dd10bb9b7d290
+Subproject 373897b4bbbafc890e631ec19125d09efbc4c8c
diff --git a/qtdoc b/qtdoc
-Subproject 5290cda943d013b5e630b9bbf8c6d8e2f79f072
+Subproject 4ae023839759657478ca393055992eabee05e27
diff --git a/qtimageformats b/qtimageformats
-Subproject f83d417b7b8595b384f9fba96b96107f474df33
+Subproject 71d9b6b8855ff060964ced2a2508c0d10d3983c
diff --git a/qtmqtt b/qtmqtt
new file mode 160000
+Subproject 150e35d48086d3fa488a4de9beb718713e731e0
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject e151a7afc6ad36dc2df3eeda95154804a261d15
+Subproject 1b24f8f472548d815735f93e6e313d41dc0b100
diff --git a/qtopcua b/qtopcua
new file mode 160000
+Subproject 2131f67494957519225ab3487f5a7201e7a9ce2
diff --git a/qtqa b/qtqa
-Subproject b0eee13d4390ae7bdde161b9659a2922b0a83c5
+Subproject a054f63dcfad2b8beadf98669792178169155de
diff --git a/qtquick3d b/qtquick3d
-Subproject 60a51c975cedb9ddd82c4109a47f6fd8938e02f
+Subproject 025a872585467e0672397b2d8d422556e8727a5
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 7be5c50775781593483b5956df15f3e7b1e225d
+Subproject 65d225661bf14e624f534dca900f3df26806ce7
diff --git a/qtquicktimeline b/qtquicktimeline
-Subproject b3ff9f762e2884d637fdb3a24ecadfbcadde2e6
+Subproject a2f76822e92881f15addf670eb9e388325ecd68
diff --git a/qtrepotools b/qtrepotools
-Subproject a829867f0873227451099d77597706b5efb5ed1
+Subproject e97f6a4d5a1490df0a4e5708dece60f452e04f6
diff --git a/qtshadertools b/qtshadertools
-Subproject 03ee874da27b88b46f06abd124d8a5345f02821
+Subproject f13989c1b21534ee1b0e5b38578dcce12dbb88a
diff --git a/qtsvg b/qtsvg
-Subproject af7b4e8d7d0836b778bcafba6d34ea36c43a010
+Subproject db100719911af8d5728d54ed1e6866f07a774c8
diff --git a/qttools b/qttools
-Subproject e9c0625d07ed4d476cd8fdba4cfb4d2509f4631
+Subproject 792adc3dd0f59a56273189f290c3edc327e140b
diff --git a/qttranslations b/qttranslations
-Subproject 50facb10cb7b62545a0c5be4fec0ae91a0db636
+Subproject 125adc55b4b7005c0609d1c65c3dbed8f6dc48c
diff --git a/qtwayland b/qtwayland
-Subproject 49276bc3bfb5578e9dfa3b1fe9be7f63d599651
+Subproject 49f7b8ef3505e8f0d9a5acfeea9c2e09e6f1697