From 9ca0c5251312fbb7b83264eff28ef98287c7f70d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 14 Dec 2014 21:56:50 +0200 Subject: Updated submodules. Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index ae5216a5..2a484f4c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit ae5216a58b3f2a5fb2ca6031f28e6fe9d66bd59d +Subproject commit 2a484f4c3d23d8b9fdaa381696251736d5d3da10 diff --git a/qtandroidextras b/qtandroidextras index efabc3f1..5287fdbe 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit efabc3f1c4cff9158924d4c3721470d82ea89ec9 +Subproject commit 5287fdbed542e43e389824ab62978c96f00d5b25 diff --git a/qtbase b/qtbase index 2409ed7d..1cc83b57 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2409ed7d48e8c0e34e79d8b750fe3e5432a0d3f9 +Subproject commit 1cc83b575d2a79b771b4b536a554cd4869c3687c diff --git a/qtconnectivity b/qtconnectivity index 944dbb9b..8eafcc2d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 944dbb9b558719b3ff9e2d129a328142c0ae6228 +Subproject commit 8eafcc2d6960390d6784a1c5bb075d6314041fdf diff --git a/qtdeclarative b/qtdeclarative index fa0eea53..1321b366 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fa0eea53f73c9b03b259f075e4cd5b83bfefccd3 +Subproject commit 1321b366b05784a38b82fa1312c83fec6f979ace diff --git a/qtdoc b/qtdoc index e08cbb3d..5b2fe568 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e08cbb3db7d873b5b5bd94e252c7013eb0a81ab3 +Subproject commit 5b2fe568e33674129ee932374b3eb6d3e62f4b72 diff --git a/qtenginio b/qtenginio index f8ad37de..91b829f5 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit f8ad37de2d7170d1548252608f8c04aac6ec1035 +Subproject commit 91b829f55f892bc5a9179a659655688305be8eca diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 9e9600d9..e9e740ef 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 9e9600d92224084f7942a6bd83b926c630a29747 +Subproject commit e9e740ef4778dffe9b5dbd1d6abdd94517fdb2fb diff --git a/qtimageformats b/qtimageformats index 9141782a..015d6117 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9141782adabcfd374285c3a52b7c386b9b90aa9a +Subproject commit 015d6117f30891fe01f57c4b5d3b3a4695c41074 diff --git a/qtlocation b/qtlocation index 48687413..9ccdcd9f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 486874134b83672ae46bce315f632943829d5303 +Subproject commit 9ccdcd9f883162783aa5d3d8e2e462e136fa2ca7 diff --git a/qtmacextras b/qtmacextras index a208e923..f9df923c 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit a208e923c2c2d3ae3029a8d2ff663eb5ba93d0a1 +Subproject commit f9df923ce186fad00070af72cb8d9a7ef500fa21 diff --git a/qtmultimedia b/qtmultimedia index 59f2bf18..cb0fb37b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 59f2bf186400241c62a02044265d9ecab81c1749 +Subproject commit cb0fb37b10589da0f7fbc2b0ed705ee8c77a1f1f diff --git a/qtqa b/qtqa index 0ef65294..6ded3992 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0ef652949e5da7b2de813fe68deb862ce491f830 +Subproject commit 6ded39926be48706c86fc30de7a71f2f63095d02 diff --git a/qtquick1 b/qtquick1 index 1f92491b..1570e410 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 1f92491bd95abc642dcd882846884a5271c8ba16 +Subproject commit 1570e410c61e0c1b3d2c68a1b667311deaaf24a9 diff --git a/qtquickcontrols b/qtquickcontrols index 9a88a502..63c8d0bf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 9a88a502a101082ede63c3773d2d5905f44f9063 +Subproject commit 63c8d0bfa74550c32f6302a48bb2b96389b47370 diff --git a/qtscript b/qtscript index c6170fa5..6a9621dc 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c6170fa5ee26cf9d0f2140d998fba2420ad1ed79 +Subproject commit 6a9621dc588b2f6509de3e6635d0ec2cf36bff3e diff --git a/qtsensors b/qtsensors index ff98a9a2..3d3d091f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ff98a9a27a18e6a48afa705e5cd84bd9461ad554 +Subproject commit 3d3d091f539b4b56f2340216a05d761e0cfc3445 diff --git a/qtserialport b/qtserialport index 383ee538..f7c7c05b 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 383ee53814649190e24e08a16acd6aee629de157 +Subproject commit f7c7c05bbd8f39626e9362c83d17164911ef5d6f diff --git a/qtsvg b/qtsvg index dd72a82e..a8cf84a3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit dd72a82e108c82cb8949517a8924c7fcb7b1e717 +Subproject commit a8cf84a30fd0701aff7b222dc365c29d4c4d4e08 diff --git a/qttools b/qttools index 7e7d549d..d033d678 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7e7d549d26028ff407a9a3d260955f95b403a406 +Subproject commit d033d6782dcece562132af55867a265623cd0676 diff --git a/qttranslations b/qttranslations index b9481cff..28db19a3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b9481cffeb41ceb9363b7be850bd9cd172b313be +Subproject commit 28db19a305159b18479fc35ab225dd771323991f diff --git a/qtwayland b/qtwayland index e47474cf..19f688da 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e47474cf91be5fa1d12bf329526d938be8293638 +Subproject commit 19f688dac38ba439dc5068fc6ad02dc271422702 diff --git a/qtwebchannel b/qtwebchannel index 86d77a90..616a5ea6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 86d77a900852691267f556fbde98406a12ee4310 +Subproject commit 616a5ea6ea99882de7e65c80b362699742448b75 diff --git a/qtwebengine b/qtwebengine index 03a52863..75b979f2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 03a52863226aeb774721db610ba831808b30836a +Subproject commit 75b979f2f0bf3eaf623595b5bc8c3d5959194f72 diff --git a/qtwebkit b/qtwebkit index 18cb1a3a..ad0bcf93 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 18cb1a3ae907d76da9eb8c54528cf3bcb074d0e5 +Subproject commit ad0bcf935d051c49c394a544a1c64747beb1df21 diff --git a/qtwebkit-examples b/qtwebkit-examples index 70bd4d52..e4076871 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 70bd4d5253f134bf48a30544030bb832f1eba8b3 +Subproject commit e4076871cd815b7e7e79886c01cffce81d9e699c diff --git a/qtwebsockets b/qtwebsockets index 64927e04..df320bec 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 64927e04f202d33b9a9a1f94141ef692c0b513ac +Subproject commit df320becb3d23ea99bf1ddfc190557e7a1729928 diff --git a/qtwinextras b/qtwinextras index a0c89f64..e16bf061 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit a0c89f649aa46e0719fd0ab63090faa43025fe59 +Subproject commit e16bf061f36dee08192efe50e5f3e68e25962000 diff --git a/qtx11extras b/qtx11extras index a21bbb45..ffeff89b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit a21bbb45019e1bbc7b583811ff2e84757082a01a +Subproject commit ffeff89b8497d42ed2a786053a9a14775f77f782 diff --git a/qtxmlpatterns b/qtxmlpatterns index 2e8b90b3..e36fe4e4 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 2e8b90b33d1d8dce4acdb6a116a227f2a5d3e044 +Subproject commit e36fe4e4afb44c46171421134538666e9e11cc01 -- cgit v1.2.3 From 0163cb617aa19a26423a716bef23bfc6308aadc6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Dec 2014 05:20:15 +0200 Subject: Updated submodules. Change-Id: I9ca0c5251312fbb7b83264eff28ef98287c7f70d Reviewed-by: Jani Heikkinen --- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 5287fdbe..030a9c9a 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 5287fdbed542e43e389824ab62978c96f00d5b25 +Subproject commit 030a9c9a0d00bf15ea632d956c9c84535774dfe7 diff --git a/qtbase b/qtbase index 1cc83b57..2b7204c0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1cc83b575d2a79b771b4b536a554cd4869c3687c +Subproject commit 2b7204c0a9d2af07e956c02113c779924ca0c188 diff --git a/qtconnectivity b/qtconnectivity index 8eafcc2d..6634ff02 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8eafcc2d6960390d6784a1c5bb075d6314041fdf +Subproject commit 6634ff02232e306547bcff4c2a405a2d36f2b139 diff --git a/qtdeclarative b/qtdeclarative index 1321b366..3d74465c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1321b366b05784a38b82fa1312c83fec6f979ace +Subproject commit 3d74465c257a1e05ce6d4239615e9ce6f273581a diff --git a/qtdoc b/qtdoc index 5b2fe568..dc3fc6db 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5b2fe568e33674129ee932374b3eb6d3e62f4b72 +Subproject commit dc3fc6db482e87b1567b003b3a8015a6d81719e7 diff --git a/qtlocation b/qtlocation index 9ccdcd9f..5924aa50 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9ccdcd9f883162783aa5d3d8e2e462e136fa2ca7 +Subproject commit 5924aa508acd42da45106c9294c9721418eb868d diff --git a/qtmultimedia b/qtmultimedia index cb0fb37b..68dbc9ba 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit cb0fb37b10589da0f7fbc2b0ed705ee8c77a1f1f +Subproject commit 68dbc9ba02475f569905b8b7b37c6a2a2961e030 diff --git a/qtquick1 b/qtquick1 index 1570e410..a03c5699 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 1570e410c61e0c1b3d2c68a1b667311deaaf24a9 +Subproject commit a03c5699af133272daad5303956768893e6695bf diff --git a/qtquickcontrols b/qtquickcontrols index 63c8d0bf..bbe7cac4 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 63c8d0bfa74550c32f6302a48bb2b96389b47370 +Subproject commit bbe7cac483b600cf6825deb4c73b93d769939bfc diff --git a/qtrepotools b/qtrepotools index 620da34f..20fad9e0 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 620da34f0af0026ce47193a5fc85a52fe10390e8 +Subproject commit 20fad9e074ff3664d79ab9d21aa414464a8c18e4 diff --git a/qtscript b/qtscript index 6a9621dc..ae753a2e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 6a9621dc588b2f6509de3e6635d0ec2cf36bff3e +Subproject commit ae753a2e59c89636f4f7ab9f3edfca96f30bb5ca diff --git a/qtsensors b/qtsensors index 3d3d091f..649396eb 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3d3d091f539b4b56f2340216a05d761e0cfc3445 +Subproject commit 649396eba96770b211ba2fc3053c53249220ca24 diff --git a/qtserialport b/qtserialport index f7c7c05b..8991fea8 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f7c7c05bbd8f39626e9362c83d17164911ef5d6f +Subproject commit 8991fea880e46b0dc7fa2a4df6eb8b58088df10f diff --git a/qtsvg b/qtsvg index a8cf84a3..04e9f7f2 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a8cf84a30fd0701aff7b222dc365c29d4c4d4e08 +Subproject commit 04e9f7f21a4c8faffdb342a141039096f00bb332 diff --git a/qttools b/qttools index d033d678..86ec5999 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d033d6782dcece562132af55867a265623cd0676 +Subproject commit 86ec599997adcd08babc818217be4d179c8d5666 diff --git a/qtwebengine b/qtwebengine index 75b979f2..f8bdc6c7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 75b979f2f0bf3eaf623595b5bc8c3d5959194f72 +Subproject commit f8bdc6c7de5ace3ff4b0335cf425e0ebb21ed75d diff --git a/qtwebkit b/qtwebkit index ad0bcf93..1dce6f9e 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit ad0bcf935d051c49c394a544a1c64747beb1df21 +Subproject commit 1dce6f9ed4508f77856d32b5f8957a81ddd5f790 diff --git a/qtwinextras b/qtwinextras index e16bf061..85ba3b7d 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e16bf061f36dee08192efe50e5f3e68e25962000 +Subproject commit 85ba3b7d83aa427d6654246a6c8f84a174a83f90 diff --git a/qtxmlpatterns b/qtxmlpatterns index e36fe4e4..64dcf54e 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e36fe4e4afb44c46171421134538666e9e11cc01 +Subproject commit 64dcf54e06556f951dff277feb9a9b6aa7767cf8 -- cgit v1.2.3 From b236ef6aefae55165044567448073f1618b52806 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Dec 2014 14:00:24 +0100 Subject: fix --branch without --no-update clearly, i botched the syntax, but i can't even tell how. that's perl. the new version is more readable anyway. Change-Id: Ic3e93c2cf30ee92f368808070899af4b9f7809a3 Reviewed-by: Sergio Ahumada --- init-repository | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 9844f38c..6a7bd38e 100755 --- a/init-repository +++ b/init-repository @@ -387,7 +387,9 @@ sub git_clone_all_submodules } if ($self->{update}) { - $self->exe('git', 'submodule', 'update', ($co_branch ? ('--remote', '--rebase') : ())); + my @cmd = ('git', 'submodule', 'update'); + push @cmd, '--remote', '--rebase' if ($co_branch); + $self->exe(@cmd); foreach my $module (@modules) { if (-f $module.'/.gitmodules') { -- cgit v1.2.3 From d553fc4fa9461b37b5275dcb556e3bdd1d93dedb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 Feb 2015 17:52:40 +0100 Subject: always check out the target branch when using --branch a submodule update with --remote will use the tip of the remote's branch, but it won't actually switch to the branch if HEAD doesn't point to it yet. Change-Id: If13e31da2646683dfb9e832eaab929190acb0167 Reviewed-by: Sergio Ahumada --- init-repository | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/init-repository b/init-repository index 6a7bd38e..b586110b 100755 --- a/init-repository +++ b/init-repository @@ -386,20 +386,7 @@ sub git_clone_all_submodules $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}); } - if ($self->{update}) { - my @cmd = ('git', 'submodule', 'update'); - push @cmd, '--remote', '--rebase' if ($co_branch); - $self->exe(@cmd); - - 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}, 0, "all"); - chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR"; - } - } - } elsif ($co_branch) { + if ($co_branch) { foreach my $module (@modules) { my $branch = $subbranches{$module}; die("No branch defined for submodule $module.\n") if (!defined($branch)); @@ -414,6 +401,20 @@ sub git_clone_all_submodules chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR"; } } + if ($self->{update}) { + my @cmd = ('git', 'submodule', 'update'); + push @cmd, '--remote', '--rebase' if ($co_branch); + $self->exe(@cmd); + + 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}, 0, "all"); + chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR"; + } + } + } return; } -- cgit v1.2.3 From 1ad0a17fa0068e5df8d0ccea2100936c583bc11e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 4 Feb 2015 21:20:06 +0100 Subject: make manual fetching sane it is in no way said that the remote's HEAD will contain the commit to be checked out - in fact, it's pretty much guaranteed that it won't for anything but the default branch. fetching the whole remote avoids additional roundtrips and makes the --branch feature actually work reasonably. Change-Id: I20de2da848b12aea8c5b2784307fe9860252009b Reviewed-by: Simon Hausmann --- init-repository | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/init-repository b/init-repository index b586110b..c6dd29b4 100755 --- a/init-repository +++ b/init-repository @@ -482,14 +482,23 @@ sub git_clone_one_submodule my $orig_cwd = getcwd(); chdir($submodule) or confess "chdir $submodule: $OS_ERROR"; - $self->exe('git', 'config', 'remote.origin.url', $url); if ($mirror) { + # This is only for the user's convenience - we make no use of it. $self->exe('git', 'config', 'remote.mirror.url', $mirror); $self->exe('git', 'config', 'remote.mirror.fetch', '+refs/heads/*:refs/remotes/mirror/*'); } if (!$do_clone && $self->{update}) { - $self->exe('git', 'fetch', ($mirror ? $mirror : $url)); + # If we didn't clone, fetch from the right location. We always update + # the origin remote, so that submodule update --remote works. + $self->exe('git', 'config', 'remote.origin.url', ($mirror ? $mirror : $url)); + $self->exe('git', 'fetch', 'origin'); + } + + if (!($do_clone || $self->{update}) || $mirror) { + # Leave the origin configured to the canonical URL. It's already correct + # if we cloned/fetched without a mirror; otherwise it may be anything. + $self->exe('git', 'config', 'remote.origin.url', $url); } my $template = getcwd()."/../.commit-template"; -- cgit v1.2.3 From 9ebad7830d5b008d7ef0f0404bc4d8ffe00cba07 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 4 Feb 2015 21:12:57 +0100 Subject: don't checkout when cloning we will subsequently do a submodule update with a possibly different sha1 anyway. Change-Id: I4950f3727e4263a73c32eff8460962d5796bc5f3 Reviewed-by: Simon Hausmann --- init-repository | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init-repository b/init-repository index c6dd29b4..b0b65409 100755 --- a/init-repository +++ b/init-repository @@ -476,7 +476,8 @@ sub git_clone_one_submodule my $do_clone = (! -e "$submodule/.git"); if ($do_clone) { - $self->exe('git', 'clone', @reference_args, ($mirror ? $mirror : $url), $submodule); + $self->exe('git', 'clone', '--no-checkout', @reference_args, + ($mirror ? $mirror : $url), $submodule); } my $orig_cwd = getcwd(); -- cgit v1.2.3 From 34c7caab3f2c259c958b804dec4aa814ca12d233 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 4 Feb 2015 21:15:18 +0100 Subject: don't fetch again when updating submodules we already did it a moment ago. this should affect only the --remote case, but there is no harm in always specifying it. Change-Id: I3ef0854c790726772fb63ab7829b59ef85ac4f18 Reviewed-by: Simon Hausmann --- init-repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-repository b/init-repository index b0b65409..9a08406e 100755 --- a/init-repository +++ b/init-repository @@ -402,7 +402,7 @@ sub git_clone_all_submodules } } if ($self->{update}) { - my @cmd = ('git', 'submodule', 'update'); + my @cmd = ('git', 'submodule', 'update', '--no-fetch'); push @cmd, '--remote', '--rebase' if ($co_branch); $self->exe(@cmd); -- cgit v1.2.3 From dc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 6 Feb 2015 05:18:54 +0200 Subject: Updated submodules. Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6 Reviewed-by: Simon Hausmann --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 2a484f4c..db68fe94 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2a484f4c3d23d8b9fdaa381696251736d5d3da10 +Subproject commit db68fe94a7502b92887d55a2bdb1741a2ec8f492 diff --git a/qtandroidextras b/qtandroidextras index 030a9c9a..aa69d430 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 030a9c9a0d00bf15ea632d956c9c84535774dfe7 +Subproject commit aa69d43037f9dd612af400ff662e0004b1d4d9dd diff --git a/qtbase b/qtbase index 2b7204c0..612953a6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2b7204c0a9d2af07e956c02113c779924ca0c188 +Subproject commit 612953a626ec21b8518ee23a4f5268b566cf41e5 diff --git a/qtconnectivity b/qtconnectivity index 6634ff02..8d3f8eab 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6634ff02232e306547bcff4c2a405a2d36f2b139 +Subproject commit 8d3f8eabf5428de257c46dda10d541d0ce4b582a diff --git a/qtdeclarative b/qtdeclarative index 3d74465c..566b23df 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3d74465c257a1e05ce6d4239615e9ce6f273581a +Subproject commit 566b23df8c31b50fc514a069564d23121d0f4ef9 diff --git a/qtdoc b/qtdoc index dc3fc6db..5d105ca5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dc3fc6db482e87b1567b003b3a8015a6d81719e7 +Subproject commit 5d105ca511117542e8e3bbefc727956eccd8741a diff --git a/qtenginio b/qtenginio index 91b829f5..6663228c 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 91b829f55f892bc5a9179a659655688305be8eca +Subproject commit 6663228c1c875da566ddf0cfd148700e271db1f8 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index e9e740ef..6eef4b5f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit e9e740ef4778dffe9b5dbd1d6abdd94517fdb2fb +Subproject commit 6eef4b5fa1836c9cb7ebc5dcb269a8d3114eb6c3 diff --git a/qtimageformats b/qtimageformats index 015d6117..2c08111f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 015d6117f30891fe01f57c4b5d3b3a4695c41074 +Subproject commit 2c08111f5450876e37730515fce4683da91be35c diff --git a/qtlocation b/qtlocation index 5924aa50..cc70f6a7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5924aa508acd42da45106c9294c9721418eb868d +Subproject commit cc70f6a7fc8d52d5f9c61f3414010d42560b409b diff --git a/qtmacextras b/qtmacextras index f9df923c..78cb91f7 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit f9df923ce186fad00070af72cb8d9a7ef500fa21 +Subproject commit 78cb91f7143ef1e768c6875475fda243094239b4 diff --git a/qtmultimedia b/qtmultimedia index 68dbc9ba..8923c0ff 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 68dbc9ba02475f569905b8b7b37c6a2a2961e030 +Subproject commit 8923c0ff6b7b3d907c3500618b3234266a0ac31b diff --git a/qtqa b/qtqa index 6ded3992..ba0e8148 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 6ded39926be48706c86fc30de7a71f2f63095d02 +Subproject commit ba0e8148fd41ffb0308ffc96c9461ea3c798d7b7 diff --git a/qtquick1 b/qtquick1 index a03c5699..5d935008 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit a03c5699af133272daad5303956768893e6695bf +Subproject commit 5d935008641cfd625678468bdcf84cbd69c37bee diff --git a/qtquickcontrols b/qtquickcontrols index bbe7cac4..13f53d45 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit bbe7cac483b600cf6825deb4c73b93d769939bfc +Subproject commit 13f53d45037629ad27b93e7a817dc0567dea5e66 diff --git a/qtrepotools b/qtrepotools index 20fad9e0..5bc8acfd 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 20fad9e074ff3664d79ab9d21aa414464a8c18e4 +Subproject commit 5bc8acfdaceab4dbc06c8cb3bb2aabeb1785d210 diff --git a/qtscript b/qtscript index ae753a2e..c3d90662 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit ae753a2e59c89636f4f7ab9f3edfca96f30bb5ca +Subproject commit c3d90662dfc65dd5f0dd8e5cd31d1bafb3328e7c diff --git a/qtsensors b/qtsensors index 649396eb..a951d6ca 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 649396eba96770b211ba2fc3053c53249220ca24 +Subproject commit a951d6caf120f14dfcde25566158768d759e07d7 diff --git a/qtserialport b/qtserialport index 8991fea8..39686161 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 8991fea880e46b0dc7fa2a4df6eb8b58088df10f +Subproject commit 39686161748c665780a276a7e309feb0e4a6e440 diff --git a/qtsvg b/qtsvg index 04e9f7f2..80b42d91 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 04e9f7f21a4c8faffdb342a141039096f00bb332 +Subproject commit 80b42d91a19a0ae9e2c15d9e0a9f828eaa45627d diff --git a/qttools b/qttools index 86ec5999..6774df3f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 86ec599997adcd08babc818217be4d179c8d5666 +Subproject commit 6774df3f54d06395f182c9119185ac2d9bd93c3f diff --git a/qttranslations b/qttranslations index 28db19a3..fa7824fa 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 28db19a305159b18479fc35ab225dd771323991f +Subproject commit fa7824fa4a7b47647580013107a38660811dd7c6 diff --git a/qtwayland b/qtwayland index 19f688da..7fec8a70 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 19f688dac38ba439dc5068fc6ad02dc271422702 +Subproject commit 7fec8a70acf8359d650a89b2eaf207b3a8b25540 diff --git a/qtwebchannel b/qtwebchannel index 616a5ea6..358e5acb 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 616a5ea6ea99882de7e65c80b362699742448b75 +Subproject commit 358e5acba3154a8ab4b53b22797c2c1eae4707dc diff --git a/qtwebengine b/qtwebengine index f8bdc6c7..ec029e04 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f8bdc6c7de5ace3ff4b0335cf425e0ebb21ed75d +Subproject commit ec029e0492b4b22ff703ef8d74c551f3f1af7926 diff --git a/qtwebkit b/qtwebkit index 1dce6f9e..379f6440 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 1dce6f9ed4508f77856d32b5f8957a81ddd5f790 +Subproject commit 379f64401d285e4047e30557513a2740d6860157 diff --git a/qtwebkit-examples b/qtwebkit-examples index e4076871..69a9c919 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit e4076871cd815b7e7e79886c01cffce81d9e699c +Subproject commit 69a9c9193abe008a9a52640b19a409e4a86c4899 diff --git a/qtwebsockets b/qtwebsockets index df320bec..2d4c382f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit df320becb3d23ea99bf1ddfc190557e7a1729928 +Subproject commit 2d4c382f0133da0b56634b96e96e5c0f7ad92a2f diff --git a/qtwinextras b/qtwinextras index 85ba3b7d..4b0c33cb 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 85ba3b7d83aa427d6654246a6c8f84a174a83f90 +Subproject commit 4b0c33cb0673f984924fd16b945c123d55ccaa2f diff --git a/qtx11extras b/qtx11extras index ffeff89b..bcc86311 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit ffeff89b8497d42ed2a786053a9a14775f77f782 +Subproject commit bcc86311359e138ecc3a8fc1ce6eee1cda2ec0f5 diff --git a/qtxmlpatterns b/qtxmlpatterns index 64dcf54e..166c31c2 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 64dcf54e06556f951dff277feb9a9b6aa7767cf8 +Subproject commit 166c31c24f86e4e95ed6004f261ba06dc5c82e0b -- cgit v1.2.3 From be35b9f9af23a2b84ccab7e24b10e70d9324e42b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 14 Feb 2015 05:23:24 +0200 Subject: Updated submodules. Change-Id: Idc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index db68fe94..a736ef5b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit db68fe94a7502b92887d55a2bdb1741a2ec8f492 +Subproject commit a736ef5bab4ed044af3b24edeff0d9178a139148 diff --git a/qtbase b/qtbase index 612953a6..f90c1860 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 612953a626ec21b8518ee23a4f5268b566cf41e5 +Subproject commit f90c1860580bcbe6b898ceb86cdd746532470c64 diff --git a/qtconnectivity b/qtconnectivity index 8d3f8eab..90291d71 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8d3f8eabf5428de257c46dda10d541d0ce4b582a +Subproject commit 90291d71308db90d763e5b42a8f096301ceb9666 diff --git a/qtdeclarative b/qtdeclarative index 566b23df..1cb329aa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 566b23df8c31b50fc514a069564d23121d0f4ef9 +Subproject commit 1cb329aaaa68ead31c0ae91a69193c7ae08e25b0 diff --git a/qtdoc b/qtdoc index 5d105ca5..00e2a32a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5d105ca511117542e8e3bbefc727956eccd8741a +Subproject commit 00e2a32aa89b6051fb4e24561baa030e72291cba diff --git a/qtlocation b/qtlocation index cc70f6a7..4a6807bc 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit cc70f6a7fc8d52d5f9c61f3414010d42560b409b +Subproject commit 4a6807bca5f4452ea7a9d6ed2ff19b8e4259a372 diff --git a/qtmultimedia b/qtmultimedia index 8923c0ff..06259f1d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8923c0ff6b7b3d907c3500618b3234266a0ac31b +Subproject commit 06259f1dfbd9cb2ebd58bba59381a42dc8a758df diff --git a/qtqa b/qtqa index ba0e8148..f1caec8c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ba0e8148fd41ffb0308ffc96c9461ea3c798d7b7 +Subproject commit f1caec8cebc7113d838d78ec1ce5e34173381c09 diff --git a/qtquick1 b/qtquick1 index 5d935008..41119e84 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 5d935008641cfd625678468bdcf84cbd69c37bee +Subproject commit 41119e843f099ce7d80f966cc754324bfe0f063f diff --git a/qtquickcontrols b/qtquickcontrols index 13f53d45..9af9dabe 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 13f53d45037629ad27b93e7a817dc0567dea5e66 +Subproject commit 9af9dabe3c88baa87befe5a4591d7f3508888307 diff --git a/qtrepotools b/qtrepotools index 5bc8acfd..cbddd3a5 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 5bc8acfdaceab4dbc06c8cb3bb2aabeb1785d210 +Subproject commit cbddd3a5a6c9022b456c0df0ae8cf30eddb8cde6 diff --git a/qtscript b/qtscript index c3d90662..e598c4b5 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c3d90662dfc65dd5f0dd8e5cd31d1bafb3328e7c +Subproject commit e598c4b5d1121030359cba800a36e40acc4730f3 diff --git a/qtsensors b/qtsensors index a951d6ca..4ff25ba1 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a951d6caf120f14dfcde25566158768d759e07d7 +Subproject commit 4ff25ba156323d9b82e7cddf16eebcb744d0e0ca diff --git a/qtserialport b/qtserialport index 39686161..b84fe7eb 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 39686161748c665780a276a7e309feb0e4a6e440 +Subproject commit b84fe7eb3d6d977a347bfbb82da724409b2eda69 diff --git a/qtsvg b/qtsvg index 80b42d91..6e44b5bd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 80b42d91a19a0ae9e2c15d9e0a9f828eaa45627d +Subproject commit 6e44b5bd59915ffe2da1864ab9fd8393890f03b8 diff --git a/qttools b/qttools index 6774df3f..638c278b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6774df3f54d06395f182c9119185ac2d9bd93c3f +Subproject commit 638c278b76c56a51f83ef8c5cc9c03f18a887f74 diff --git a/qttranslations b/qttranslations index fa7824fa..35a64da9 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit fa7824fa4a7b47647580013107a38660811dd7c6 +Subproject commit 35a64da9fd6fa38e92373798ed17f6cab73586ef diff --git a/qtwayland b/qtwayland index 7fec8a70..8458e06b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7fec8a70acf8359d650a89b2eaf207b3a8b25540 +Subproject commit 8458e06b25c07ebc8cf6b210fc1ea4cc9aeb42eb diff --git a/qtwebengine b/qtwebengine index ec029e04..4eceed9a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ec029e0492b4b22ff703ef8d74c551f3f1af7926 +Subproject commit 4eceed9ac0b646238e76d77569a619d4dc515ba5 diff --git a/qtwebkit b/qtwebkit index 379f6440..38ad9239 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 379f64401d285e4047e30557513a2740d6860157 +Subproject commit 38ad9239977ac6e66573f5508ce2f030c576093c diff --git a/qtwebsockets b/qtwebsockets index 2d4c382f..48f8a0cf 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2d4c382f0133da0b56634b96e96e5c0f7ad92a2f +Subproject commit 48f8a0cf237e757d1ef3f8be424f7a1acb915b0c diff --git a/qtwinextras b/qtwinextras index 4b0c33cb..cc8f7422 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 4b0c33cb0673f984924fd16b945c123d55ccaa2f +Subproject commit cc8f7422dded13eb0922df01e1a04514a06c80e8 diff --git a/qtxmlpatterns b/qtxmlpatterns index 166c31c2..db784fb1 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 166c31c24f86e4e95ed6004f261ba06dc5c82e0b +Subproject commit db784fb1c01ca2a0e7ada2c407cd1aab3aa98fee -- cgit v1.2.3 From 122d4551b551c9991893dcad8734262fe6475b1c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 16 Feb 2015 13:05:36 +0100 Subject: Adjust submodule branches Change-Id: I952bb9255a393baec2d9ede1cabfca7a47e2dc93 --- .gitmodules | 62 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6a2e68a1..c55010ca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,52 +1,52 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtsvg"] path = qtsvg url = ../qtsvg.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtdeclarative"] path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtactiveqt"] path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtscript"] path = qtscript url = ../qtscript.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtmultimedia"] path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 5.5 initrepo = true [submodule "qttools"] path = qttools url = ../qttools.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtxmlpatterns"] path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = 5.5 initrepo = true [submodule "qttranslations"] path = qttranslations url = ../qttranslations.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtdoc"] path = qtdoc url = ../qtdoc.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtrepotools"] path = qtrepotools @@ -56,12 +56,12 @@ [submodule "qtwebkit"] path = qtwebkit url = ../qtwebkit.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtwebkit-examples"] path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtqa"] path = qtqa @@ -71,12 +71,12 @@ [submodule "qtlocation"] path = qtlocation url = ../qtlocation.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtsensors"] path = qtsensors url = ../qtsensors.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtsystems"] path = qtsystems @@ -97,84 +97,84 @@ [submodule "qtconnectivity"] path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtwayland"] path = qtwayland url = ../qtwayland.git - branch = dev + branch = 5.5 initrepo = true [submodule "qt3d"] path = qt3d url = ../qt3d.git - branch = dev + branch = 5.5 [submodule "qtimageformats"] path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtquick1"] path = qtquick1 url = ../qtquick1.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtgraphicaleffects"] path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtquickcontrols"] path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtserialport"] path = qtserialport url = ../qtserialport.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtx11extras"] path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtmacextras"] path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtwinextras"] path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtandroidextras"] path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtenginio"] path = qtenginio url = ../qtenginio.git - branch = dev + branch = 1.2 initrepo = true [submodule "qtwebsockets"] path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtwebchannel"] path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtwebengine"] path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 5.5 initrepo = true [submodule "qtcanvas3d"] path = qtcanvas3d url = ../qtcanvas3d.git - branch = dev + branch = 5.5 initrepo = true -- cgit v1.2.3