From f5ba19c3f053990480bc958dd585a7ed5e5874ed Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 25 Jan 2016 11:38:54 +0100 Subject: Adjust submodule branches Change-Id: Id78b6c131063a8d25616282cd3b76815323e8048 --- .gitmodules | 60 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.gitmodules b/.gitmodules index 49c27df9..eb9b2a89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6 + branch = 5.6.0 initrepo = true priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6 + branch = 5.6.0 initrepo = true priority = 40 [submodule "qtrepotools"] @@ -94,14 +94,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtsystems"] depends = qtbase @@ -130,26 +130,26 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtquick1"] depends = qtscript @@ -161,14 +161,14 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtserialbus"] depends = qtserialport @@ -179,79 +179,79 @@ depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6 + branch = 1.6.0 initrepo = true [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6 + branch = 5.6.0 initrepo = true priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtpurchasing"] depends = qtbase -- cgit v1.2.3 From 3de19487d90a8035c78af4668a953d7330845705 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 27 Jan 2016 14:45:35 +0100 Subject: replace 'initrepo' with more fine-grained 'status' instead of a simple bool, we now have five states: preview, active, addon, obsolete, and ignore (the default). the default includes the first three. the CI system is expected to use --module-subset=all,-ignore to include everything that is expected to build (in some configurations). Change-Id: Ifb43412054a8e42db0425f24f8e53acfce363caa Reviewed-by: Simon Hausmann --- .gitmodules | 73 ++++++++++++++++++++++++++++++++------------------------- init-repository | 43 +++++++++++++++++++++++++++------ 2 files changed, 77 insertions(+), 39 deletions(-) diff --git a/.gitmodules b/.gitmodules index eb9b2a89..4e2087b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,72 +2,72 @@ path = qtbase url = ../qtbase.git branch = 5.6.0 - initrepo = true + status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = 5.6.0 - initrepo = true + status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git branch = 5.6.0 - initrepo = true + status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git branch = 5.6.0 - initrepo = true + status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git branch = 5.6.0 - initrepo = true + status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git branch = 5.6.0 - initrepo = true + status = essential priority = 40 [submodule "qtrepotools"] path = qtrepotools url = ../qtrepotools.git branch = master - initrepo = true + status = essential qt = false [submodule "qtwebkit"] depends = qtbase @@ -75,6 +75,7 @@ path = qtwebkit url = ../qtwebkit.git branch = 5.6 + status = obsolete project = WebKit.pro priority = 20 [submodule "qtwebkit-examples"] @@ -82,12 +83,13 @@ path = qtwebkit-examples url = ../qtwebkit-examples.git branch = 5.6 + status = obsolete [submodule "qtqa"] depends = qtbase path = qtqa url = ../qtqa.git branch = master - initrepo = true + status = essential priority = 50 [submodule "qtlocation"] depends = qtbase @@ -95,167 +97,174 @@ path = qtlocation url = ../qtlocation.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtsystems"] depends = qtbase recommends = qtdeclarative path = qtsystems url = ../qtsystems.git branch = dev + status = ignore [submodule "qtfeedback"] depends = qtdeclarative recommends = qtmultimedia path = qtfeedback url = ../qtfeedback.git branch = master + status = ignore [submodule "qtdocgallery"] depends = qtdeclarative path = qtdocgallery url = ../qtdocgallery.git branch = master + status = ignore [submodule "qtpim"] depends = qtdeclarative path = qtpim url = ../qtpim.git branch = dev + status = ignore [submodule "qtconnectivity"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git branch = 5.6.0 - initrepo = true + status = preview [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git branch = 5.6.0 - initrepo = true + status = preview [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = 5.6 + status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git branch = 5.6.0 - initrepo = true + status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git branch = 5.6 + status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git branch = 1.6.0 - initrepo = true + status = obsolete [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git branch = 5.6.0 - initrepo = true + status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = 5.6.0 - initrepo = true + status = preview [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git branch = 5.6 + status = ignore diff --git a/init-repository b/init-repository index f0407f63..966e0c16 100755 --- a/init-repository +++ b/init-repository @@ -71,9 +71,12 @@ Options: --module-subset=,... 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 default is - the set of maintained modules. Module names may be prefixed with a - dash to exclude them from a bigger set. + string "all" results in cloning all known modules. The strings + "essential", "addon", "preview", "obsolete", and "ignore" refer to + classes of modules; "default" maps to "essential,addon,preview", + 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 set, e.g. "all,-ignore". --no-update Skip the `git submodule update' command. @@ -234,6 +237,7 @@ sub parse_arguments # Replace any double trailing slashes from end of mirror $self->{'mirror-url'} =~ s{//+$}{/}; + $self->{'module-subset'} =~ s/\bdefault\b/preview,essential,addon/; $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ]; return; @@ -272,6 +276,13 @@ sub git_submodule_init return; } +use constant { + STS_PREVIEW => 1, + STS_ESSENTIAL => 2, + STS_ADDON => 3, + STS_OBSOLETE => 4 +}; + sub git_clone_all_submodules { my ($self, $my_repo_base, $co_branch, @subset) = @_; @@ -296,8 +307,20 @@ sub git_clone_all_submodules $subbases{$mod} = $base; } elsif ($2 eq "update") { push @subset, '-'.$1 if ($3 eq 'none'); - } elsif ($2 eq "initrepo") { - $subinits{$1} = ($3 eq "yes" or $3 eq "true"); + } elsif ($2 eq "status") { + if ($3 eq "preview") { + $subinits{$1} = STS_PREVIEW; + } elsif ($3 eq "essential") { + $subinits{$1} = STS_ESSENTIAL; + } elsif ($3 eq "addon") { + $subinits{$1} = STS_ADDON; + } elsif ($3 eq "obsolete") { + $subinits{$1} = STS_OBSOLETE; + } elsif ($3 eq "ignore") { + delete $subinits{$1}; + } else { + die("Invalid subrepo status '$3' for '$1'.\n"); + } } } @@ -305,8 +328,14 @@ sub git_clone_all_submodules foreach my $mod (@subset) { if ($mod eq "all") { map { $include{$_} = 1; } keys %subbases; - } elsif ($mod eq "default") { - map { $include{$_} = 1; } grep { $subinits{$_} } keys %subbases; + } elsif ($mod eq "essential") { + map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases; + } elsif ($mod eq "addon") { + map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases; + } elsif ($mod eq "preview") { + map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases; + } elsif ($mod eq "obsolete") { + map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases; } elsif ($mod =~ s/^-//) { delete $include{$mod}; } else { -- cgit v1.2.3 From d1d52b5c1e40bdc94431ab303fa6368b12fe4f53 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 27 Jan 2016 15:42:46 +0100 Subject: properly complain about invalid entries in --module-subset Change-Id: I13ec7a6acdc8a47efea14bfabf0413d8a3570870 Reviewed-by: Simon Hausmann --- init-repository | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/init-repository b/init-repository index 966e0c16..ae3f0495 100755 --- a/init-repository +++ b/init-repository @@ -337,8 +337,12 @@ sub git_clone_all_submodules } elsif ($mod eq "obsolete") { map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases; } elsif ($mod =~ s/^-//) { + print "Warning: excluding non-existent module '$mod'.\n" + if (!defined($subdirs{$mod})); delete $include{$mod}; } else { + die("Error: module subset names non-existent '$mod'.\n") + if (!defined($subdirs{$mod})); $include{$mod} = 1; } } -- cgit v1.2.3 From b680c074d1fc31e453ff3ec343ba8427fd2332ee Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 Feb 2016 17:16:42 +0100 Subject: Updated submodules. Change-Id: Ic407bd126cc4c0a557ec7769d41394aa68c0cbee Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qt3d b/qt3d index 44c743c9..910065ad 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 44c743c90cf51eddbf5b0bb3cf957c58fa0ef94f +Subproject commit 910065ad7585cbef7f49356de0c1434c791a9263 diff --git a/qtactiveqt b/qtactiveqt index 7a8395dc..ffa6ba6d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7a8395dc18a14a4ed356bd69ada5fbf9721ba5fe +Subproject commit ffa6ba6d81bc79769b5d7c14b3c11f5fb644e3b5 diff --git a/qtbase b/qtbase index 7dceb227..38e602d0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7dceb227485e4ebd240b9820b599faa4d2a24e93 +Subproject commit 38e602d0f2e4c292296d603fda22b366d8879daf diff --git a/qtcanvas3d b/qtcanvas3d index 30ae03d2..f669d170 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 30ae03d289dd967edfea5e164be677085dc45e84 +Subproject commit f669d1708c1009adc7d82d42bf550e0d971e827f diff --git a/qtconnectivity b/qtconnectivity index 46d72709..c2b7f094 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 46d727097c986e6c359291b9ad08ebe1b1b271f0 +Subproject commit c2b7f094e798d15a9231966a1df897ea124cb745 diff --git a/qtdeclarative b/qtdeclarative index 872a0547..d444d21a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 872a05475721ad771bd347d1526035e6e7479d30 +Subproject commit d444d21a517c45c0fda0bdf955cbda61e0088be6 diff --git a/qtdoc b/qtdoc index e5b6397c..e54612bb 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e5b6397c4af2189be82b0602059be88381cafffd +Subproject commit e54612bb30a58fc60e6aa8174ed1d77d612b382e diff --git a/qtimageformats b/qtimageformats index d7e294de..0bd46d58 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d7e294ded23240d62f662579eeed733e6b981d60 +Subproject commit 0bd46d5861fa7b48c87cd3a734d00671df929869 diff --git a/qtlocation b/qtlocation index a41bd807..574433e0 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a41bd80784a01050dfb6b888cd90505259471f4f +Subproject commit 574433e01b2f747ee5585f97c77b4ad1783213f3 diff --git a/qtqa b/qtqa index de8520af..e5bbdb21 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit de8520af69fcc9a83d44828b8b01ea7c2cc2ed41 +Subproject commit e5bbdb21629ee613925a90eaceb07207da21e5a3 diff --git a/qtquick1 b/qtquick1 index a669c33d..b0382acf 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit a669c33d9c6f42a29d31f493a888ec4fef29bcd8 +Subproject commit b0382acf65dbc0debcb7cf956ba954117a682d90 diff --git a/qtquickcontrols b/qtquickcontrols index 148faf62..144bc5ce 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 148faf6278186986d1ca6afcdea0c361bcbf199e +Subproject commit 144bc5cedd9af5e62fe7210bac7df2c19d20c41b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0cf2f3f6..7fc567ed 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0cf2f3f63472540e45f08e6c61d1662a5ec3f218 +Subproject commit 7fc567eda8a187e365f4c29c6e8f08440bf31218 diff --git a/qtrepotools b/qtrepotools index 0b050777..bbd7a798 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0b050777c276010eda68ecdbb3cd5024c846225e +Subproject commit bbd7a798279cf60376e94c82fc900495e764a068 diff --git a/qtscript b/qtscript index 94307729..a70f6a1b 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 94307729ed362dde428582603234ad2ec964d4c4 +Subproject commit a70f6a1b9599931fccd13b15a1700e61137f7e72 diff --git a/qtsensors b/qtsensors index e9e4d351..ad52d307 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e9e4d351df2167a2326608c170131222bef7fff7 +Subproject commit ad52d307cbff44b77bf7d4fa923377b72bb04374 diff --git a/qtserialbus b/qtserialbus index 11661526..e2c26722 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 11661526113009079c22ed18701c17543c62c25c +Subproject commit e2c26722fad7ce4b034682ca697abfe4743ef19a diff --git a/qttools b/qttools index 2b8b1192..ab47de29 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2b8b119290d7b453cd1c5ef8ee62bf653eaffbb0 +Subproject commit ab47de291a0b0111d0ef956dc4c4599e2066602d diff --git a/qttranslations b/qttranslations index 2d9a8c83..41d21229 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2d9a8c83893be4abde136ec87fc3db220ce8a0a5 +Subproject commit 41d212290c3822b8eef151785d89ac5f5b246bde diff --git a/qtwebengine b/qtwebengine index 52d9eeab..ca731a74 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 52d9eeab53b5cfd92c15c9a25894991f84cd827e +Subproject commit ca731a7446f0485886a04474415a21d2f64e3f8b diff --git a/qtwebkit b/qtwebkit index 62dd2add..629e1017 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 62dd2add32c7c4d5d409d457c818ac88c952e7f6 +Subproject commit 629e101715f3e5b58a3b0ee54295af4d957d7e78 diff --git a/qtwinextras b/qtwinextras index 7167af38..b53d3a1e 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 7167af382ff3ada668462ad6e7df7b6643609fc5 +Subproject commit b53d3a1e1439f4af908094dc82ba27c9b82d07cd diff --git a/qtxmlpatterns b/qtxmlpatterns index 640b381a..de2dadb8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 640b381a2bf72b32e6a98adc366e5f56140a5597 +Subproject commit de2dadb8af67f9d425c3a8d2353a7d5b07588915 -- cgit v1.2.3 From 3cfe8712ae4730e871fb6c1278f1b2bbc61c1c1b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 27 Jan 2016 16:03:59 +0100 Subject: fix branches of some modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit all repos which are released (whichever way) need release branches. and vice versa. also, it needs to be the *right* release branch. Task-number: QTBUG-50695 Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144 Reviewed-by: Jędrzej Nowacki Reviewed-by: Robert Loehning Reviewed-by: Simon Hausmann --- .gitmodules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4e2087b7..6f4cf63c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.6 + branch = 5.6.0 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6 + branch = 5.6.0 status = obsolete [submodule "qtqa"] depends = qtbase @@ -162,7 +162,7 @@ recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6 + branch = 5.6.0 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative @@ -181,7 +181,7 @@ depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6 + branch = 5.6.0 status = preview [submodule "qtserialport"] depends = qtbase @@ -218,7 +218,7 @@ depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 1.6.0 + branch = 5.6.0 status = obsolete [submodule "qtwebsockets"] depends = qtbase @@ -266,5 +266,5 @@ recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.6 + branch = dev status = ignore -- cgit v1.2.3 From 37c75a23e8d17893ec9c1bf2a4615ea3876f4204 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Feb 2016 21:24:55 +0200 Subject: Updated submodules. Change-Id: I8740e98ba27c1f554366a5183c6972207f0b0061 Reviewed-by: Frederik Gladhorn --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 910065ad..190795b1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 910065ad7585cbef7f49356de0c1434c791a9263 +Subproject commit 190795b1f884620ba8b31d3998ac97107d4f4eb7 diff --git a/qtbase b/qtbase index 38e602d0..8c2b4266 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 38e602d0f2e4c292296d603fda22b366d8879daf +Subproject commit 8c2b4266002736da499d169a0da187e5cdc5381a diff --git a/qtconnectivity b/qtconnectivity index c2b7f094..8b550f0a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c2b7f094e798d15a9231966a1df897ea124cb745 +Subproject commit 8b550f0a7508ed413cded71a20485e61010b0aa3 diff --git a/qtdeclarative b/qtdeclarative index d444d21a..19dffeed 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d444d21a517c45c0fda0bdf955cbda61e0088be6 +Subproject commit 19dffeed2e677cf03b6e122c7a15f355ebe413c8 diff --git a/qtdoc b/qtdoc index e54612bb..2479b039 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e54612bb30a58fc60e6aa8174ed1d77d612b382e +Subproject commit 2479b039d195477fa2e24fde44ab1ff4a9758330 diff --git a/qtlocation b/qtlocation index 574433e0..a2b6581e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 574433e01b2f747ee5585f97c77b4ad1783213f3 +Subproject commit a2b6581e5a865ec1a3a7006b668e36c64d2f7ef5 diff --git a/qtmultimedia b/qtmultimedia index 365e05ba..d633c02c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 365e05bad8c4a42a449eeef257a16c6f8faca318 +Subproject commit d633c02ce21b4b5aa9d9877c9424fcc0f363aa6b diff --git a/qtquick1 b/qtquick1 index b0382acf..dcc5e5c0 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit b0382acf65dbc0debcb7cf956ba954117a682d90 +Subproject commit dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 diff --git a/qtquickcontrols b/qtquickcontrols index 144bc5ce..fc9c57cf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 144bc5cedd9af5e62fe7210bac7df2c19d20c41b +Subproject commit fc9c57cf8b66bafbcaa6957bb22293047aa3d9df diff --git a/qttools b/qttools index ab47de29..eb59d808 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ab47de291a0b0111d0ef956dc4c4599e2066602d +Subproject commit eb59d8084af321d05b4ebdfb2c1e051dfdca0b62 diff --git a/qtwebchannel b/qtwebchannel index eaebf63c..92d903d9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit eaebf63c17964d449b75b7d2d6af3d0efaee5ed9 +Subproject commit 92d903d92b430222cd3f89eab08d61d947e5abea diff --git a/qtwebengine b/qtwebengine index ca731a74..87cc80fd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ca731a7446f0485886a04474415a21d2f64e3f8b +Subproject commit 87cc80fd8182b24ff42f0f5458cb82f139730536 diff --git a/qtwebkit b/qtwebkit index 629e1017..be8e169b 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 629e101715f3e5b58a3b0ee54295af4d957d7e78 +Subproject commit be8e169ba38c84562194906047d0da04bf3ae91a -- cgit v1.2.3