From 1fcdb6cafcf7621fdea84e28a95934a4a04ea1b7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Jan 2016 10:25:06 +0100 Subject: [PATCH 1/9] Updated submodules. Change-Id: I88b34da37a589451ae32c6f736f4dc863715b339 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index ba467a2c..44c743c9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ba467a2c4e44df7934792dfacaa8135c77a010c1 +Subproject commit 44c743c90cf51eddbf5b0bb3cf957c58fa0ef94f diff --git a/qtbase b/qtbase index 26379d03..7dceb227 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 26379d0320637b11519a2f161fb458eb9360ed88 +Subproject commit 7dceb227485e4ebd240b9820b599faa4d2a24e93 diff --git a/qtmultimedia b/qtmultimedia index 02b8c752..365e05ba 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 02b8c7527a88d1cfaed296b856fce63fd62a6c9e +Subproject commit 365e05bad8c4a42a449eeef257a16c6f8faca318 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e8837674..0cf2f3f6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e8837674931b7f59c154083614eb182b121767f0 +Subproject commit 0cf2f3f63472540e45f08e6c61d1662a5ec3f218 From f5ba19c3f053990480bc958dd585a7ed5e5874ed Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 25 Jan 2016 11:38:54 +0100 Subject: [PATCH 2/9] 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 From 3de19487d90a8035c78af4668a953d7330845705 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 27 Jan 2016 14:45:35 +0100 Subject: [PATCH 3/9] 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 { From d1d52b5c1e40bdc94431ab303fa6368b12fe4f53 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 27 Jan 2016 15:42:46 +0100 Subject: [PATCH 4/9] 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; } } From b680c074d1fc31e453ff3ec343ba8427fd2332ee Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 Feb 2016 17:16:42 +0100 Subject: [PATCH 5/9] 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 From 3cfe8712ae4730e871fb6c1278f1b2bbc61c1c1b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 27 Jan 2016 16:03:59 +0100 Subject: [PATCH 6/9] 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 From 37c75a23e8d17893ec9c1bf2a4615ea3876f4204 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Feb 2016 21:24:55 +0200 Subject: [PATCH 7/9] 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 From c2549708e50a85a9d764a160cd10bda78fe4c2c2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Feb 2016 12:57:12 +0100 Subject: [PATCH 8/9] Updated submodules. Change-Id: I020482ae1107cdd56fad485007622cb4b62b8032 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtfeedback | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpim | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qtsystems | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 44c743c9..149ce21d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 44c743c90cf51eddbf5b0bb3cf957c58fa0ef94f +Subproject commit 149ce21d47df023f1638620efd940404ae36465e diff --git a/qtactiveqt b/qtactiveqt index 7a8395dc..450651e8 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7a8395dc18a14a4ed356bd69ada5fbf9721ba5fe +Subproject commit 450651e8155bbdec44253a9c282ec385257b2f8a diff --git a/qtandroidextras b/qtandroidextras index 3dee82ad..c826d6ab 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 3dee82ad4b3f5c8976bbc245b9d5753a50a2a1cf +Subproject commit c826d6ab7f3058857de883eb605abdb399772c01 diff --git a/qtbase b/qtbase index 7dceb227..42b39f98 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7dceb227485e4ebd240b9820b599faa4d2a24e93 +Subproject commit 42b39f9827b8410077b0330cab41f20feeabf678 diff --git a/qtcanvas3d b/qtcanvas3d index 30ae03d2..d367ac81 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 30ae03d289dd967edfea5e164be677085dc45e84 +Subproject commit d367ac81d5ef77f02434274524477dc0e5c2b4a4 diff --git a/qtconnectivity b/qtconnectivity index 46d72709..c8745896 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 46d727097c986e6c359291b9ad08ebe1b1b271f0 +Subproject commit c87458961f29064ab69a308526b0243debcdf1f7 diff --git a/qtdeclarative b/qtdeclarative index 872a0547..ece8d595 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 872a05475721ad771bd347d1526035e6e7479d30 +Subproject commit ece8d59598fa1f8783d054ce2218b2b462cb93ee diff --git a/qtdoc b/qtdoc index e5b6397c..5ae0440b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e5b6397c4af2189be82b0602059be88381cafffd +Subproject commit 5ae0440b02b2365ade05f7c287e5c615e5dfdf78 diff --git a/qtenginio b/qtenginio index 2a19257a..60a13510 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 2a19257a5eef7a25a05d5cf7ea69ecc4184226f3 +Subproject commit 60a135102aaa37d0d817883e4d6aed456372709d diff --git a/qtfeedback b/qtfeedback index 862de791..28ca6241 160000 --- a/qtfeedback +++ b/qtfeedback @@ -1 +1 @@ -Subproject commit 862de791d785797a561204c78490f31a318a9360 +Subproject commit 28ca62414901502189ea28ef2efd551386187619 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 2f0e5e72..24f3fd69 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 2f0e5e726d76b8ad5a0e9b07aeb57006490e18b4 +Subproject commit 24f3fd69a2e953619c48b4a632262ce8419fee40 diff --git a/qtimageformats b/qtimageformats index d7e294de..eaeeacd1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d7e294ded23240d62f662579eeed733e6b981d60 +Subproject commit eaeeacd1d0efdf1e65c1742240b2a8d5219d5b94 diff --git a/qtlocation b/qtlocation index a41bd807..5cb6d1ba 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a41bd80784a01050dfb6b888cd90505259471f4f +Subproject commit 5cb6d1bac19bf779afbbd22bbe723e43aa86c1b7 diff --git a/qtmacextras b/qtmacextras index d8ebb7ee..fc3413ec 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit d8ebb7eeea7e6b19763f248d1e04e8a22b91bad5 +Subproject commit fc3413ec7639969cd66ccc17931a8eec4b89216b diff --git a/qtmultimedia b/qtmultimedia index 365e05ba..dd7c19ea 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 365e05bad8c4a42a449eeef257a16c6f8faca318 +Subproject commit dd7c19ea9d6be922faca57013b06b0f2b0787169 diff --git a/qtpim b/qtpim index fa74ad6e..de4cfc6b 160000 --- a/qtpim +++ b/qtpim @@ -1 +1 @@ -Subproject commit fa74ad6eda129af79416c54e42b6e4326e8c954b +Subproject commit de4cfc6b53b426799a035fefe81db9d49d3d03ab diff --git a/qtpurchasing b/qtpurchasing index 951d75d7..b5c6c76f 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 951d75d744ab66665b41d533ce3d38df07c04005 +Subproject commit b5c6c76fac771326064295368a53cbdaf2bf0f70 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..87f2415a 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit a669c33d9c6f42a29d31f493a888ec4fef29bcd8 +Subproject commit 87f2415adf34da08e6cd58f5da6f6a7d0d9cf141 diff --git a/qtquickcontrols b/qtquickcontrols index 148faf62..d600966e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 148faf6278186986d1ca6afcdea0c361bcbf199e +Subproject commit d600966e0aef236649b7a35520742f086f91cc07 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0cf2f3f6..67169ffa 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0cf2f3f63472540e45f08e6c61d1662a5ec3f218 +Subproject commit 67169ffa7dbf9e83e0fea35930457dc7792ef05d diff --git a/qtrepotools b/qtrepotools index 0b050777..ae405002 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0b050777c276010eda68ecdbb3cd5024c846225e +Subproject commit ae40500269059a24caaf390ebbc45de458960657 diff --git a/qtscript b/qtscript index 94307729..525c18f7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 94307729ed362dde428582603234ad2ec964d4c4 +Subproject commit 525c18f7780a39474e71790d54cf90de29bc1fd6 diff --git a/qtsensors b/qtsensors index e9e4d351..fbaca62c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e9e4d351df2167a2326608c170131222bef7fff7 +Subproject commit fbaca62cd0a7309f04bf82101c8e20dbbf423192 diff --git a/qtserialbus b/qtserialbus index 11661526..7e68b954 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 11661526113009079c22ed18701c17543c62c25c +Subproject commit 7e68b9549caaaae31a0647998ed7aa3ea2136957 diff --git a/qtserialport b/qtserialport index 6dda140a..f4303a4d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6dda140ada3d7c683537b069bf1512275a190884 +Subproject commit f4303a4d71b770ce4d990ff52efc6bedfb1020e5 diff --git a/qtsvg b/qtsvg index 38777ea7..a9ac71a4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 38777ea7451d55e9c3d32d88d46063016013f60c +Subproject commit a9ac71a443260de66f720f0184646847b03fcb46 diff --git a/qtsystems b/qtsystems index 37b614ab..cc207770 160000 --- a/qtsystems +++ b/qtsystems @@ -1 +1 @@ -Subproject commit 37b614abbfb35d06a57e5b0824249c3abd5640e3 +Subproject commit cc2077700bd5503d1fcf53aef83cbb76975e745a diff --git a/qttools b/qttools index 2b8b1192..98eebb2d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2b8b119290d7b453cd1c5ef8ee62bf653eaffbb0 +Subproject commit 98eebb2dc1830b262d72e748817aee25e54d0d35 diff --git a/qttranslations b/qttranslations index 2d9a8c83..ce85e4ee 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2d9a8c83893be4abde136ec87fc3db220ce8a0a5 +Subproject commit ce85e4ee4ee22e5dea3b44707a27dab44319708e diff --git a/qtwayland b/qtwayland index baec8be7..bebe9bef 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit baec8be7294a176620253dbbc1b2938cf96c8360 +Subproject commit bebe9beff3e9874498474cec32634cf281ddc453 diff --git a/qtwebchannel b/qtwebchannel index eaebf63c..e777ff1f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit eaebf63c17964d449b75b7d2d6af3d0efaee5ed9 +Subproject commit e777ff1f88e58c1b47044ac83aafa8ccafa3840f diff --git a/qtwebengine b/qtwebengine index 52d9eeab..532548f7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 52d9eeab53b5cfd92c15c9a25894991f84cd827e +Subproject commit 532548f7cfff68d89fdf2e592862e72f3ad55810 diff --git a/qtwebkit b/qtwebkit index 62dd2add..5cd506a8 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 62dd2add32c7c4d5d409d457c818ac88c952e7f6 +Subproject commit 5cd506a8e1bcad3d0b414827db51b907e9f4a94b diff --git a/qtwebkit-examples b/qtwebkit-examples index 7988aecd..1b9a0fc9 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 7988aecdbcb07f3a214c2c804a39db3fc5617844 +Subproject commit 1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34 diff --git a/qtwebsockets b/qtwebsockets index 469f7485..2d8c94cf 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 469f748515b65cd4c9bec8794ec37ca6cf5df026 +Subproject commit 2d8c94cf11097b61689757f8a0162bb7dd9d7d0b diff --git a/qtwebview b/qtwebview index 134974f6..bad80f37 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 134974f6457c828ebeef2288b57804164cb4e147 +Subproject commit bad80f375645b758770d01ba65947981cc062715 diff --git a/qtwinextras b/qtwinextras index 7167af38..cffeddfa 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 7167af382ff3ada668462ad6e7df7b6643609fc5 +Subproject commit cffeddfab1467561ec7a2df7ccbe6c634cdf89a6 diff --git a/qtx11extras b/qtx11extras index d64ee96f..5df9fa8f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d64ee96f0df4d3baa6959b8552bc59d53cb0b451 +Subproject commit 5df9fa8f3a7209c067a5d5068776b9aa52273d3b diff --git a/qtxmlpatterns b/qtxmlpatterns index 640b381a..a8d103a0 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 640b381a2bf72b32e6a98adc366e5f56140a5597 +Subproject commit a8d103a05bc195dd045779f3aebdf67bd0140df1 From fdf1b3cc8df45afbf620155ae1bf2f277a56db22 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 8 Feb 2016 17:54:06 +0100 Subject: [PATCH 9/9] rework hook installation the primary purpose of this change is making it work with new-style submodules (1.7+) and git-worktree (2.5+). this means resolving '.git' and 'commondir' files. we avoid calling git commands, because a) it's slow on windows, b) some of them are unavailable in older git versions and it's tedious to deal with that and c) their output is not necessarily optimal (not always absolute paths). we also don't use relative paths for the hook locations any more, as that's too tedious to deal with. Change-Id: Ie341e748e56d6bef40856e4a49ac368850028d83 Reviewed-by: Simon Hausmann --- init-repository | 49 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/init-repository b/init-repository index ae3f0495..b941646b 100755 --- a/init-repository +++ b/init-repository @@ -156,7 +156,10 @@ EOF use Carp qw( confess ); use English qw( -no_match_vars ); use Getopt::Long qw( GetOptions ); -use Cwd qw( getcwd ); +use Cwd qw( getcwd abs_path ); + +my $script_path = abs_path($0); +$script_path =~ s,[/\\][^/\\]+$,,; my $GERRIT_SSH_BASE = 'ssh://@USER@codereview.qt-project.org@PORT@/'; @@ -516,11 +519,16 @@ sub ensure_link return if (!$self->{'force-hooks'} and -f $tgt); unlink($tgt); # In case we have a dead symlink or pre-existing hook print "Aliasing $src\n as $tgt ...\n" if (!$self->{quiet}); - return if eval { symlink($src, $tgt) }; + if ($^O ne "msys" && $^O ne "MSWin32") { + return if eval { symlink($src, $tgt) }; + } # Windows doesn't do (proper) symlinks. As the post_commit script needs # them to locate itself, we write a forwarding script instead. open SCRIPT, ">".$tgt or die "Cannot create forwarding script $tgt: $!\n"; - print SCRIPT "#!/bin/sh\nexec `dirname \$0`/$src \"\$\@\"\n"; + # Make the path palatable for MSYS. + $src =~ s,\\,/,g; + $src =~ s,^(.):/,/$1/,g; + print SCRIPT "#!/bin/sh\nexec $src \"\$\@\"\n"; close SCRIPT; } @@ -528,19 +536,30 @@ sub git_install_hooks { my ($self) = @_; - return if (!-d 'qtrepotools/git-hooks'); + my $hooks = $script_path.'/qtrepotools/git-hooks'; + return if (!-d $hooks); - # Force C locale as git submodule returns the localized string "Entering" - local $ENV{LC_ALL} = 'C'; - chomp(my @modules = `git submodule foreach :`); - push @modules, ""; - for my $module (@modules) { - $module =~ s,^Entering \'([^\']+)\'$,$1/,; - my $rel = $module; - $rel =~ s,[^/]+,..,g; - $rel .= "../../qtrepotools/git-hooks/"; - $self->ensure_link($rel.'gerrit_commit_msg_hook', $module.'.git/hooks/commit-msg'); - $self->ensure_link($rel.'git_post_commit_hook', $module.'.git/hooks/post-commit'); + my @configresult = qx(git config --list --local); + foreach my $line (@configresult) { + next if ($line !~ /submodule\.([^.=]+)\.url=/); + my $module = $1.'/.git'; + if (!-d $module) { + open GITD, $module or die "Cannot open $module: $!\n"; + my $gd = ; + close GITD; + chomp($gd); + $gd =~ s/^gitdir: // or die "Malformed .git file $module\n"; + $module = $gd; # We expect it to be always absolute. + if (open COMD, $module.'/commondir') { + my $cd = ; + chomp($cd); + $module .= '/'.$cd; + $module = abs_path($module); + close COMD; + } + } + $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module.'/hooks/commit-msg'); + $self->ensure_link($hooks.'/git_post_commit_hook', $module.'/hooks/post-commit'); } }