Add QtQuickControls2 as submodule

Change-Id: I435fb765b48a978763384226e399b33448a40502
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>

.gitmodules

@@ -1,52 +1,52 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtsvg"]
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtdeclarative"]
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtactiveqt"]
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtscript"]
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtmultimedia"]
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qttools"]
 	path = qttools
 	url = ../qttools.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qttranslations"]
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtrepotools"]
 	path = qtrepotools
@@ -56,13 +56,11 @@
 [submodule "qtwebkit"]
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.5
+	branch = 5.6
-	initrepo = true
 [submodule "qtwebkit-examples"]
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.5
+	branch = 5.6
-	initrepo = true
 [submodule "qtqa"]
 	path = qtqa
 	url = ../qtqa.git
@@ -71,12 +69,12 @@
 [submodule "qtlocation"]
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtsensors"]
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtsystems"]
 	path = qtsystems
@@ -97,85 +95,98 @@
 [submodule "qtconnectivity"]
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtwayland"]
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtquick1"]
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.5
+	branch = 5.6
-	initrepo = true
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtquickcontrols"]
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
+[submodule "qtserialbus"]
+	path = qtserialbus
+	url = ../qtserialbus.git
+	branch = 5.6
 [submodule "qtserialport"]
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtmacextras"]
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtwinextras"]
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtandroidextras"]
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 1.2
+	branch = 5.6
 	initrepo = true
 [submodule "qtwebsockets"]
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtwebchannel"]
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtwebengine"]
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.5
+	branch = 5.6
 	initrepo = true
 [submodule "qtcanvas3d"]
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.5
+	branch = 5.6
+	initrepo = true
+[submodule "qtwebview"]
+	path = qtwebview
+	url = ../qtwebview.git
+	branch = 5.6
+	initrepo = true
+[submodule "qtquickcontrols2"]
+	path = qtquickcontrols2
+	url = ../qtquickcontrols2.git
+	branch = 5.6
 	initrepo = true

init-repository

@@ -79,12 +79,6 @@ B<Module options:>
 
 =over
 
-=item --no-webkit
-
-Skip webkit and webkit examples submodules.
-It may be desirable to skip these modules due to the large size of the webkit
-git repository.
-
 =item --module-subset=<module1>,<module2>...
 
 Only initialize the specified subset of modules given as the argument. Specified
@@ -239,7 +233,6 @@ sub parse_arguments
         'ignore-submodules'   => 0 ,
         'mirror-url'          => "",
         'update'              => 1 ,
-        'webkit'              => 1 ,
         'module-subset'       => "default",
     );
 
@@ -254,7 +247,6 @@ sub parse_arguments
         'mirror=s'          =>  \$self->{qw{ mirror-url        }},
         'quiet'             =>  \$self->{qw{ quiet             }},
         'update!'           =>  \$self->{qw{ update            }},
-        'webkit!'           =>  \$self->{qw{ webkit            }},
         'module-subset=s'   =>  \$self->{qw{ module-subset     }},
 
         'help|?'            =>  sub { pod2usage(1);               },
@@ -271,9 +263,6 @@ sub parse_arguments
     $self->{'mirror-url'} =~ s{//+$}{/};
 
     $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ];
-    if (!$self->{webkit}) {
-        push @{$self->{'module-subset'}}, "-qtwebkit", "-qtwebkit-examples";
-    }
 
     return;
 }
@@ -334,7 +323,7 @@ sub git_clone_all_submodules
             while ($base =~ s,/(?!\.\./)[^/]+/\.\./,/,g) {}
             $subbases{$mod} = $base;
         } elsif ($2 eq "update") {
-            push @subset, '-'.$1 if ($3 eq 'ignore');
+            push @subset, '-'.$1 if ($3 eq 'none');
         } elsif ($2 eq "initrepo") {
             $subinits{$1} = ($3 eq "yes" or $3 eq "true");
         }

qt.pro

@@ -58,6 +58,7 @@ ANDROID_EXTRAS =
 android: ANDROID_EXTRAS = qtandroidextras
 
 addModule(qtbase)
+addModule(qtwebview, qtdeclarative, qtwebengine)
 addModule(qtandroidextras, qtbase)
 addModule(qtmacextras, qtbase)
 addModule(qtx11extras, qtbase)
@@ -65,6 +66,7 @@ addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
 addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
 addModule(qtquickcontrols, qtdeclarative, qtgraphicaleffects)
+addModule(qtquickcontrols2, qtquickcontrols)
 addModule(qtmultimedia, qtbase, qtdeclarative)
 addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
 addModule(qtactiveqt, qtbase)
@@ -84,12 +86,13 @@ addModule(qt3d, qtdeclarative qtimageformats)
 addModule(qtcanvas3d, qtdeclarative)
 addModule(qtgraphicaleffects, qtdeclarative)
 addModule(qtscript, qtbase, qttools)
-addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
+addModule(qtquick1, qtscript, qtsvg qtxmlpatterns)
 addModule(qtdocgallery, qtdeclarative)
 addModule(qtwayland, qtbase, qtdeclarative)
+addModule(qtserialbus, qtbase)
 addModule(qtserialport, qtbase)
 addModule(qtenginio, qtdeclarative)
-addModule(qtwebengine, qtquickcontrols qtwebchannel, qtwebkit qtlocation)
+addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation)
 addModule(qttranslations, qttools)
 addModule(qtdoc, qtdeclarative)
 addModule(qtqa, qtbase)