Merge commit 'b021c416b50598dd8da6e7099318ab4b31b6e3ab' into pyside6.0

Change-Id: I3ca531ac8f6b72d6d2ad4e28522b3ef4ab8e8f80

.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

coin/provisioning/qtci-windows-10-x86/90-squish.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\squishInstall.ps1"

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'}});