From e8053418e43127327f6df892ae774a1707a9ae97 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 7 Nov 2014 23:24:04 +0200 Subject: Updated submodules. Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qttools | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 21e5d77e..3d70925e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 21e5d77e85ced10db6fe9c1bf2e0461195e1560c +Subproject commit 3d70925ee54d06e90bea392883d230b8ae2b1782 diff --git a/qtdeclarative b/qtdeclarative index c748f51f..3d389f2a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c748f51fb42685242ce197d3948ae1429a2da98d +Subproject commit 3d389f2a47dad538925ca1916e889c4bbc48fbac diff --git a/qtqa b/qtqa index 72231780..32d0a6f0 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 722317800ef3f6f4f9456959a0e980e68c40dbd9 +Subproject commit 32d0a6f06c4e95853b24cdcfbff44bd6e125a35c diff --git a/qttools b/qttools index d14e2b48..dcfd75a1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d14e2b48205157b6776b82af18adfb2dd0050286 +Subproject commit dcfd75a1bb765b8c54d6bf31483160ad64115e95 diff --git a/qtwebengine b/qtwebengine index 7dad2572..0b5a7d61 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7dad257209972b86efa327892073cf0d293a5afe +Subproject commit 0b5a7d6132164994221fd83f70e705772337137e -- cgit v1.2.3 From d5946d420f14ade23362a67188d80a5c95f66c0a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 10 Nov 2014 18:08:58 +0100 Subject: teach init-repository about branches specifically, add the --branch option and the necessary keys to .gitmodules. Change-Id: I09e2df6bd012629f76a35238d66697637bdffe44 Reviewed-by: Simon Hausmann --- .gitmodules | 36 ++++++++++++++++++++++++++++++++++++ init-repository | 33 +++++++++++++++++++++++++++++---- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 714bcc7c..958a63ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,139 +1,175 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git + branch = 5.4.0 initrepo = true [submodule "qtsvg"] path = qtsvg url = ../qtsvg.git + branch = 5.4.0 initrepo = true [submodule "qtdeclarative"] path = qtdeclarative url = ../qtdeclarative.git + branch = 5.4.0 initrepo = true [submodule "qtactiveqt"] path = qtactiveqt url = ../qtactiveqt.git + branch = 5.4.0 initrepo = true [submodule "qtscript"] path = qtscript url = ../qtscript.git + branch = 5.4.0 initrepo = true [submodule "qtmultimedia"] path = qtmultimedia url = ../qtmultimedia.git + branch = 5.4.0 initrepo = true [submodule "qttools"] path = qttools url = ../qttools.git + branch = 5.4.0 initrepo = true [submodule "qtxmlpatterns"] path = qtxmlpatterns url = ../qtxmlpatterns.git + branch = 5.4.0 initrepo = true [submodule "qttranslations"] path = qttranslations url = ../qttranslations.git + branch = 5.4.0 initrepo = true [submodule "qtdoc"] path = qtdoc url = ../qtdoc.git + branch = 5.4.0 initrepo = true [submodule "qtrepotools"] path = qtrepotools url = ../qtrepotools.git + branch = master initrepo = true [submodule "qtwebkit"] path = qtwebkit url = ../qtwebkit.git + branch = 5.4.0 initrepo = true [submodule "qtwebkit-examples"] path = qtwebkit-examples url = ../qtwebkit-examples.git + branch = 5.4.0 initrepo = true [submodule "qtqa"] path = qtqa url = ../qtqa.git + branch = master initrepo = true [submodule "qtlocation"] path = qtlocation url = ../qtlocation.git + branch = 5.4.0 initrepo = true [submodule "qtsensors"] path = qtsensors url = ../qtsensors.git + branch = 5.4.0 initrepo = true [submodule "qtsystems"] path = qtsystems url = ../qtsystems.git + branch = dev [submodule "qtfeedback"] path = qtfeedback url = ../qtfeedback.git + branch = master [submodule "qtdocgallery"] path = qtdocgallery url = ../qtdocgallery.git + branch = master [submodule "qtpim"] path = qtpim url = ../qtpim.git + branch = dev [submodule "qtconnectivity"] path = qtconnectivity url = ../qtconnectivity.git + branch = 5.4.0 initrepo = true [submodule "qtwayland"] path = qtwayland url = ../qtwayland.git + branch = 5.4.0 initrepo = true [submodule "qt3d"] path = qt3d url = ../qt3d.git + branch = dev [submodule "qtimageformats"] path = qtimageformats url = ../qtimageformats.git + branch = 5.4.0 initrepo = true [submodule "qtquick1"] path = qtquick1 url = ../qtquick1.git + branch = 5.4.0 initrepo = true [submodule "qtgraphicaleffects"] path = qtgraphicaleffects url = ../qtgraphicaleffects.git + branch = 5.4.0 initrepo = true [submodule "qtquickcontrols"] path = qtquickcontrols url = ../qtquickcontrols.git + branch = 5.4.0 initrepo = true [submodule "qtserialport"] path = qtserialport url = ../qtserialport.git + branch = 5.4.0 initrepo = true [submodule "qtx11extras"] path = qtx11extras url = ../qtx11extras.git + branch = 5.4.0 initrepo = true [submodule "qtmacextras"] path = qtmacextras url = ../qtmacextras.git + branch = 5.4.0 initrepo = true [submodule "qtwinextras"] path = qtwinextras url = ../qtwinextras.git + branch = 5.4.0 initrepo = true [submodule "qtandroidextras"] path = qtandroidextras url = ../qtandroidextras.git + branch = 5.4.0 initrepo = true [submodule "qtenginio"] path = qtenginio url = ../qtenginio.git + branch = 1.1.0 initrepo = true [submodule "qtwebsockets"] path = qtwebsockets url = ../qtwebsockets.git + branch = 5.4.0 initrepo = true [submodule "qtwebchannel"] path = qtwebchannel url = ../qtwebchannel.git + branch = 5.4.0 initrepo = true [submodule "qtwebengine"] path = qtwebengine url = ../qtwebengine.git + branch = 5.4.0 initrepo = true diff --git a/init-repository b/init-repository index 6a2d2f74..3fdfa83f 100755 --- a/init-repository +++ b/init-repository @@ -105,6 +105,12 @@ Module names may be prefixed with a dash to exclude them from a bigger set. Skip the `git submodule update' command. +=item --branch + +Instead of checking out specific SHA1s, check out the submodule branches that +correspond with the current supermodule commit. +By default, this option will cause local commits in the submodules to be rebased. +With --no-update, the branches will be checked out, but their heads will not move. =item --ignore-submodules @@ -233,6 +239,7 @@ sub parse_arguments %{$self} = (%{$self}, 'alternates' => "", + 'branch' => 0, 'codereview-username' => "", 'detach-alternates' => 0 , 'force' => 0 , @@ -246,6 +253,7 @@ sub parse_arguments GetOptionsFromArray(\@args, 'alternates=s' => \$self->{qw{ alternates }}, + 'branch' => \$self->{qw{ branch }}, 'codereview-username=s' => \$self->{qw{ codereview-username }}, 'copy-objects' => \$self->{qw{ detach-alternates }}, 'force|f' => \$self->{qw{ force }}, @@ -313,9 +321,10 @@ sub git_submodule_init sub git_clone_all_submodules { - my ($self, $my_repo_base, @subset) = @_; + my ($self, $my_repo_base, $co_branch, @subset) = @_; my %subdirs = (); + my %subbranches = (); my %subbases = (); my %subinits = (); my @submodconfig = qx(git config -l -f .gitmodules); @@ -324,6 +333,8 @@ sub git_clone_all_submodules next if ($line !~ /^submodule\.([^.=]+)\.([^.=]+)=(.*)$/); if ($2 eq "path") { $subdirs{$1} = $3; + } elsif ($2 eq "branch") { + $subbranches{$1} = $3; } elsif ($2 eq "url") { my ($mod, $base) = ($1, $3); next if ($base !~ /^\.\.\//); @@ -376,16 +387,30 @@ sub git_clone_all_submodules } if ($self->{update}) { - $self->exe('git', 'submodule', 'update'); + $self->exe('git', 'submodule', 'update', ($co_branch ? ('--remote', '--rebase') : ())); foreach my $module (@modules) { if (-f $module.'/.gitmodules') { my $orig_cwd = getcwd(); chdir($module) or confess "chdir $module: $OS_ERROR"; - $self->git_clone_all_submodules($subbases{$module}, "all"); + $self->git_clone_all_submodules($subbases{$module}, 0, "all"); chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR"; } } + } elsif ($co_branch) { + foreach my $module (@modules) { + my $branch = $subbranches{$module}; + die("No branch defined for submodule $module.\n") if (!defined($branch)); + my $orig_cwd = getcwd(); + chdir($module) or confess "chdir $module: $OS_ERROR"; + my $br = qx(git rev-parse -q --verify $branch); + if (!$br) { + $self->exe('git', 'checkout', '-b', $branch, "origin/$branch"); + } else { + $self->exe('git', 'checkout', $branch); + } + chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR"; + } } return; @@ -532,7 +557,7 @@ sub run $url =~ s,qt/qt5$,,; $self->{'base-url'} = $url; - $self->git_clone_all_submodules('qt/qt5', @{$self->{'module-subset'}}); + $self->git_clone_all_submodules('qt/qt5', $self->{branch}, @{$self->{'module-subset'}}); $self->git_add_remotes('qt/qt5'); -- cgit v1.2.3 From 8f35cb288615801ae09e5a4a294d6848bd5c33be Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 11 Nov 2014 15:01:38 +0100 Subject: Fix description of --mirror argument The argument actually requires a trailing slash. Change-Id: Idc2567746d2b3f4ebf31c2bce5ec683d2a1f425b Reviewed-by: Oswald Buddenhagen --- init-repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 3fdfa83f..4a01aa6d 100755 --- a/init-repository +++ b/init-repository @@ -178,7 +178,7 @@ Uses as the base URL for submodule git mirrors. For example: - --mirror user@machine:/foo/bar + --mirror user@machine:/foo/bar/ ...will use the following as a mirror for qtbase: -- cgit v1.2.3 From 402bf7aec25d5224e1d725c551e8162420aaea29 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 11 Nov 2014 15:14:26 +0100 Subject: Fix cloning with mirrors Commit 486f5f37761 broke the cloning with one of the mirror options: git ls-remote git://mirror/qt/qtactiveqt.git.git test/if/mirror/exists fatal: The remote end hung up unexpectedly Change-Id: Ia154ee34dd10e35b24676777d8dde98ef0790ee1 Reviewed-by: Oswald Buddenhagen --- init-repository | 1 - 1 file changed, 1 deletion(-) diff --git a/init-repository b/init-repository index 4a01aa6d..0028b7bd 100755 --- a/init-repository +++ b/init-repository @@ -460,7 +460,6 @@ sub git_clone_one_submodule my $mirror; if ($mirror_url) { $mirror = $mirror_url.$repo_basename; - $mirror .= ".git" unless (-d $mirror); # Support local disk mirror } if ($mirror) { -- cgit v1.2.3 From 38cfc8ec958a73aa3b5e8f110441728c60e5bb2e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 10 Nov 2014 18:10:31 +0100 Subject: don't fetch unless we are updating it's just wasting time. Change-Id: I541cc535c5c95b0140cfa14d7cb042dbe029525e Reviewed-by: Simon Hausmann Reviewed-by: Frederik Gladhorn --- init-repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 0028b7bd..9844f38c 100755 --- a/init-repository +++ b/init-repository @@ -485,7 +485,7 @@ sub git_clone_one_submodule $self->exe('git', 'config', 'remote.mirror.fetch', '+refs/heads/*:refs/remotes/mirror/*'); } - if (!$do_clone) { + if (!$do_clone && $self->{update}) { $self->exe('git', 'fetch', ($mirror ? $mirror : $url)); } -- cgit v1.2.3 From 96d903eec0ee9d2fd76e1e3f1ebfd868ad937dbe Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 12 Nov 2014 22:23:56 +0200 Subject: Updated submodules. Change-Id: Ie8053418e43127327f6df892ae774a1707a9ae97 Reviewed-by: Jani Heikkinen --- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index d55d17b0..efabc3f1 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit d55d17b0dc14daebc8329036dc1479465d1ef339 +Subproject commit efabc3f1c4cff9158924d4c3721470d82ea89ec9 diff --git a/qtbase b/qtbase index 3d70925e..3e161dcb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3d70925ee54d06e90bea392883d230b8ae2b1782 +Subproject commit 3e161dcb3dcee13a942bb7f0aca1a1920808acd3 diff --git a/qtdeclarative b/qtdeclarative index 3d389f2a..dd6e14a7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3d389f2a47dad538925ca1916e889c4bbc48fbac +Subproject commit dd6e14a7df6e40ff8b9ffe22fe6124630a15bda0 diff --git a/qtdoc b/qtdoc index cb15bf84..b6955495 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cb15bf8450a969a9561265dade95dbe6fdb3a646 +Subproject commit b6955495e2fda22018f9fa3d846384e32d46f052 diff --git a/qtimageformats b/qtimageformats index fef13b3b..c7155c05 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit fef13b3b4c1a8af83086ecf49430903778e63624 +Subproject commit c7155c05394649a08b494a63d22f4ba3039a7a98 diff --git a/qtmultimedia b/qtmultimedia index d0ed4f3b..2020b032 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d0ed4f3b085414dc8288363e527e49ebfd2eb339 +Subproject commit 2020b032e83d1b61736a80a6815635aa7451deed diff --git a/qtquickcontrols b/qtquickcontrols index c81870d2..0bcb1054 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c81870d244c432633866e442df6343be886d7549 +Subproject commit 0bcb10542727e6f84459ba2779139a71effd965d diff --git a/qtscript b/qtscript index eec790c8..ec17c3d0 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit eec790c8c699d859617712a77b224750a85a93ad +Subproject commit ec17c3d029f608405252eca20e72b69e58e42b2c diff --git a/qttools b/qttools index dcfd75a1..9b50f200 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dcfd75a1bb765b8c54d6bf31483160ad64115e95 +Subproject commit 9b50f20005aae1e7d2e3687ee4750bb4323fe17a diff --git a/qttranslations b/qttranslations index b9481cff..f5ed5421 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b9481cffeb41ceb9363b7be850bd9cd172b313be +Subproject commit f5ed542137b53c0b3fb7b68fa5dd667baaf29cd2 diff --git a/qtwebengine b/qtwebengine index 0b5a7d61..51d7318a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0b5a7d6132164994221fd83f70e705772337137e +Subproject commit 51d7318aa4bebd38d43daad0dc19b45ab3afaa35 diff --git a/qtwebkit b/qtwebkit index b4f22058..7e29781f 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit b4f2205830a4dc199452bc26fb8cab6741a3d4e7 +Subproject commit 7e29781fac7f864ac80ca52be5e61c4f1a500308 diff --git a/qtwebsockets b/qtwebsockets index 0854eda4..d1c9ede1 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 0854eda408de542047a0ef38c37953719a8f9fde +Subproject commit d1c9ede19976767393fe5db2f396c0c18d6fbced diff --git a/qtxmlpatterns b/qtxmlpatterns index 045028f9..2e8b90b3 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 045028f951959dc217a0fc1c19f014989bfaaa1f +Subproject commit 2e8b90b33d1d8dce4acdb6a116a227f2a5d3e044 -- cgit v1.2.3 From 4b199501287c5a5961405ae0667c04dc1188af44 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 19 Nov 2014 00:36:57 +0200 Subject: Updated submodules. Change-Id: I96d903eec0ee9d2fd76e1e3f1ebfd868ad937dbe Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtsvg | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 3e161dcb..e86f1cea 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3e161dcb3dcee13a942bb7f0aca1a1920808acd3 +Subproject commit e86f1ceaedba24187747ab6b1d4b4712fbcca137 diff --git a/qtconnectivity b/qtconnectivity index daba4737..25c2d479 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit daba4737a9e1c43bb6284f235428cd04e2d8b938 +Subproject commit 25c2d4793bd4a55eec6e51ccbdfece9e505b8715 diff --git a/qtdeclarative b/qtdeclarative index dd6e14a7..dd08a22a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dd6e14a7df6e40ff8b9ffe22fe6124630a15bda0 +Subproject commit dd08a22a4e8d7120341a1227e227de3f0628dd2f diff --git a/qtdoc b/qtdoc index b6955495..0db83783 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b6955495e2fda22018f9fa3d846384e32d46f052 +Subproject commit 0db837832b7299172355d0a4318c6cc3fb909fa5 diff --git a/qtimageformats b/qtimageformats index c7155c05..954fa54a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c7155c05394649a08b494a63d22f4ba3039a7a98 +Subproject commit 954fa54a88cff31a7fc869a49d17474ab1da8459 diff --git a/qtlocation b/qtlocation index 87c35420..e0dab1c7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 87c354205d9ccd4c2e12fe974695876fd562b77a +Subproject commit e0dab1c7341d24012018fefc3f3e89929cdb3afe diff --git a/qtmultimedia b/qtmultimedia index 2020b032..96407d8d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2020b032e83d1b61736a80a6815635aa7451deed +Subproject commit 96407d8d8980f5dee7a0848366c20584dbd8c321 diff --git a/qtquickcontrols b/qtquickcontrols index 0bcb1054..331c10d4 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0bcb10542727e6f84459ba2779139a71effd965d +Subproject commit 331c10d457b4dd7a9e4aa7d9c8724e0790cfebe0 diff --git a/qtsvg b/qtsvg index aaa06d6c..eece19e6 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit aaa06d6c82e02961f92690b10c84a0030dc0ebb7 +Subproject commit eece19e62638409b479cabcbb985978d61d84307 diff --git a/qtwebengine b/qtwebengine index 51d7318a..a659a309 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 51d7318aa4bebd38d43daad0dc19b45ab3afaa35 +Subproject commit a659a309fa6f280e657458123c64a401707a9db0 diff --git a/qtwebkit b/qtwebkit index 7e29781f..def5fef7 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 7e29781fac7f864ac80ca52be5e61c4f1a500308 +Subproject commit def5fef7fbf7fedece54d52188f75a90616599a4 -- cgit v1.2.3 From 7c0bc2305680fac216bbaa72ac83f65b04feffff Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 19 Nov 2014 23:29:18 +0200 Subject: Updated submodules. Change-Id: I4b199501287c5a5961405ae0667c04dc1188af44 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index e86f1cea..8ed994f7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e86f1ceaedba24187747ab6b1d4b4712fbcca137 +Subproject commit 8ed994f7acd0988a7399e89c2c8f58309754c1c1 diff --git a/qtdoc b/qtdoc index 0db83783..e96d2de6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0db837832b7299172355d0a4318c6cc3fb909fa5 +Subproject commit e96d2de6f6cad386901f0d9d6e0cc421951864c9 diff --git a/qtqa b/qtqa index 32d0a6f0..0ef65294 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 32d0a6f06c4e95853b24cdcfbff44bd6e125a35c +Subproject commit 0ef652949e5da7b2de813fe68deb862ce491f830 -- cgit v1.2.3 From 77f387bc89c06d870b7d41516734ee3f1c68e71a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 21 Nov 2014 10:24:14 +0200 Subject: Updated submodules. Change-Id: I7c0bc2305680fac216bbaa72ac83f65b04feffff Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 8ed994f7..087aa1f3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8ed994f7acd0988a7399e89c2c8f58309754c1c1 +Subproject commit 087aa1f3cb5975ef55e42db54487f737c93a4f0f diff --git a/qtquickcontrols b/qtquickcontrols index 331c10d4..5cb56a1a 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 331c10d457b4dd7a9e4aa7d9c8724e0790cfebe0 +Subproject commit 5cb56a1adae19e608787cb39b6d90e0a09258871 diff --git a/qttools b/qttools index 9b50f200..75041cd2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9b50f20005aae1e7d2e3687ee4750bb4323fe17a +Subproject commit 75041cd2744f2a90de21977cebdbf519c408f7b8 diff --git a/qtwebengine b/qtwebengine index a659a309..8af12f0c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a659a309fa6f280e657458123c64a401707a9db0 +Subproject commit 8af12f0c9ee0cfdf28f557e96086bb7b08d786bc -- cgit v1.2.3 From 338ee26271c05b612fc58381270ca471db12aaef Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 25 Nov 2014 06:05:03 +0200 Subject: Updated submodules. Change-Id: I77f387bc89c06d870b7d41516734ee3f1c68e71a Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtconnectivity | 2 +- qtdoc | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 087aa1f3..155306ff 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 087aa1f3cb5975ef55e42db54487f737c93a4f0f +Subproject commit 155306ffee1941194d44dd632a7993fce4a05606 diff --git a/qtconnectivity b/qtconnectivity index 25c2d479..5d405d07 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 25c2d4793bd4a55eec6e51ccbdfece9e505b8715 +Subproject commit 5d405d07fb51502d0bfab08f4d74aa5eba365bab diff --git a/qtdoc b/qtdoc index e96d2de6..d7bc0695 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e96d2de6f6cad386901f0d9d6e0cc421951864c9 +Subproject commit d7bc0695d9fe18f412604543b596715babc332f7 diff --git a/qtquickcontrols b/qtquickcontrols index 5cb56a1a..ea099e34 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5cb56a1adae19e608787cb39b6d90e0a09258871 +Subproject commit ea099e341b5f8845be56f81b22e44a8b6cb227a2 diff --git a/qtrepotools b/qtrepotools index caa16fc4..a2ae0a78 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit caa16fc4332873d33691935164ef03768a7742c7 +Subproject commit a2ae0a7870d574242c4f30f110960f07128b81a7 diff --git a/qttools b/qttools index 75041cd2..5060a0ec 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 75041cd2744f2a90de21977cebdbf519c408f7b8 +Subproject commit 5060a0ec7dcb26826b19eefbd6063efcbde6101f diff --git a/qtwebengine b/qtwebengine index 8af12f0c..c5957ac9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8af12f0c9ee0cfdf28f557e96086bb7b08d786bc +Subproject commit c5957ac90cbaccccbd58b3fc73f94cf0d4795e54 -- cgit v1.2.3