Add QtQuickControls2 as submodule

Change-Id: I435fb765b48a978763384226e399b33448a40502 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Hook qtserialbus into qt5.git
2026-01-31 10:56:01 +08:00 · 2015-09-03 22:45:29 +00:00 · 2015-09-03 17:40:25 +00:00 · 2015-09-03 17:40:17 +00:00 · 2015-09-03 17:40:10 +00:00 · 2015-09-03 17:40:03 +00:00
43 changed files with 89 additions and 83 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,52 +1,52 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtsvg"]
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtdeclarative"]
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtactiveqt"]
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtscript"]
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtmultimedia"]
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qttools"]
 	path = qttools
 	url = ../qttools.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qttranslations"]
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtrepotools"]
 	path = qtrepotools
@@ -56,13 +56,11 @@
 [submodule "qtwebkit"]
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.5.1
-	initrepo = true
+	branch = 5.6
 [submodule "qtwebkit-examples"]
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.5.1
-	initrepo = true
+	branch = 5.6
 [submodule "qtqa"]
 	path = qtqa
 	url = ../qtqa.git
@@ -71,12 +69,12 @@
 [submodule "qtlocation"]
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtsensors"]
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtsystems"]
 	path = qtsystems
@@ -97,85 +95,98 @@
 [submodule "qtconnectivity"]
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtwayland"]
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtquick1"]
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.5.1
-	initrepo = true
+	branch = 5.6
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtquickcontrols"]
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.5.1
+	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.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtmacextras"]
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtwinextras"]
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtandroidextras"]
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 1.2.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtwebsockets"]
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtwebchannel"]
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtwebengine"]
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.5.1
+	branch = 5.6
 	initrepo = true
 [submodule "qtcanvas3d"]
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.5.1
+	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
--- a/gnuwin32/bin/win_bison.exe
+++ b/gnuwin32/bin/win_bison.exe
--- a/gnuwin32/bin/win_flex.exe
+++ b/gnuwin32/bin/win_flex.exe
--- a/13
+++ b/13
@@ -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");
        }
--- a/qt.pro
+++ b/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)
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Frederik Gladhorn	e734941df8	Add QtQuickControls2 as submodule Change-Id: I435fb765b48a978763384226e399b33448a40502 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>	2015-09-03 22:45:29 +00:00
Alex Blasche	c5cb9d2d89	Hook qtserialbus into qt5.git Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-09-03 17:40:25 +00:00
Frederik Gladhorn	4c520caa69	Add qtwebview as submodule Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>	2015-09-03 17:40:17 +00:00
Jani Heikkinen	4116ec2474	Removed QtWebkit and QtWebkit-Examples from qt5.git QtWebkit (and QtWebkit-Examples) were deprecated in Qt 5.5 and will now be removed from qt5.git in Qt5.6 release Change-Id: I86e1072141956136fa5e4220cdcdf812492453b3 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>	2015-09-03 17:40:10 +00:00
Simon Hausmann	3e1fd2cb31	Fix QtEnginio branch The 1.3 branch does not exist anymore, let's use 5.6 Change-Id: I442ad45c73a0e08c853385c999dddf818447bb82 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-09-03 17:40:03 +00:00
Simon Hausmann	1a46c456eb	Updated submodules. Change-Id: Ie8c296b8e64fe0083ab5ec1584a42c7165fbe3ab Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>	2015-09-03 17:39:54 +00:00
Jani Heikkinen	812ff69df4	Remove quick1 from default checkout QtQuick1 was deprecated in Qt 5.5 and will now be removed from default modules in qt5.git Change-Id: I88aa9d75ace8d91b4cd469d7511662425e67d95f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>	2015-08-27 19:44:22 +00:00
Liang Qi	c9425926e1	Merge remote-tracking branch 'origin/5.5' into 5.6 Conflicts: qt3d qtactiveqt qtandroidextras qtbase qtcanvas3d qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats qtlocation qtmacextras qtmultimedia qtqa qtquick1 qtquickcontrols qtrepotools qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland qtwebchannel qtwebengine qtwebkit qtwebkit-examples qtwebsockets qtwinextras qtx11extras qtxmlpatterns Change-Id: I7410d9be5775ab276fb5a57adb397f4f92d77a50	2015-08-24 16:18:23 +02:00
Oswald Buddenhagen	f587983764	fix qtcanvas3d submodule reference Change-Id: I67d89f5e8d04a1e60ff0aedc33e29da7a58df620	2015-08-12 16:31:03 +02:00
Oswald Buddenhagen	cab251cd8d	Adjust submodule branches Change-Id: I7755bb88167297aef9defaa6b66639fde6e9804d	2015-08-10 16:53:39 +02:00
Qt Submodule Update Bot	1d3966833b	Updated submodules. Change-Id: Idc11a328839163ffae5e72f2e43860b12f19c668 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-07-11 03:32:32 +00:00
Qt Submodule Update Bot	dc11a32883	Updated submodules. Change-Id: Ic5910fb0b28553d1eb0815e578381fd358e342fc Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-06-25 19:31:21 +00:00
Qt Submodule Update Bot	c5910fb0b2	Updated submodules. Change-Id: Ic5e879665945d79c0fcdb27c2c00978b7abdeef6 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-06-23 19:28:08 +00:00
Qt Submodule Update Bot	c5e8796659	Updated submodules. Change-Id: I5c321f6626e9bf6f64f2c120e8281547e2561880 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-06-21 11:31:31 +00:00
Qt Submodule Update Bot	5c321f6626	Updated submodules. Change-Id: I3009287ec75bfa7b3084fad32a75552656845434 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>	2015-06-20 17:13:47 +00:00
Qt Submodule Update Bot	3009287ec7	Updated submodules. Change-Id: I7257e86c7381f5237c2c135a4395e88b65735cd3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-06-18 04:43:56 +00:00
Qt Submodule Update Bot	7257e86c73	Updated submodules. Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-06-09 04:27:26 +00:00
Frederik Gladhorn	9edcb24889	Merge remote-tracking branch 'origin/5.5' into dev Conflicts: qt3d qtactiveqt qtandroidextras qtbase qtcanvas3d qtconnectivity qtdeclarative qtdoc qtenginio qtimageformats qtlocation qtmacextras qtmultimedia qtqa qtquick1 qtquickcontrols qtrepotools qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland qtwebengine qtwebkit qtwebkit-examples qtwebsockets qtwinextras qtxmlpatterns Change-Id: I691dbbe6d3399d601336bb7e309579fb89d6381c	2015-04-21 16:26:04 +02:00
Simon Hausmann	b34e3669ff	Prospective fix for unnecessary submodule cloning When cloning qtdeclarative, we end up also cloning qtdeclarative-testsuites, which is not intentional for users of Qt (and init-repository). The init-repository script checks for the submodule "repo".update key and skips the sub module if the value is "ignore". However according to the documentation no checkout is to be done if the value is "none", which is also what qtdeclarative's .gitmodules specifies for the ecmascript test suite. Change-Id: Ieb37607ae4ea7c32d6af886d3e2533fb9dea1f13 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-03-27 10:04:11 +00:00
Jani Heikkinen	1b9d3e4ec0	Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev	2015-03-27 10:04:06 +00:00
Qt Submodule Update Bot	b02397e9df	Updated submodules. Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>	2015-03-27 10:03:59 +00:00
Oswald Buddenhagen	4afaae4020	Merge remote-tracking branch 'origin/5.5' into dev Change-Id: I44a6915c1212bb636456368a2b5dc36b9c26fe01	2015-03-20 13:17:05 +01:00