lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.6.0' into 5.6

Browse Source 
Conflicts:
	.gitmodules

Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
This commit is contained in:
Oswald Buddenhagen
2016-02-12 11:18:27 +01:00
parent 1fcdb6cafc 37c75a23e8
commit 4007fc7a26
2 changed files with 82 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
.gitmodules vendored
View File

@@ -2,72 +2,72 @@
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = 5.6 branch = 5.6
initrepo = true status = essential
[submodule "qtsvg"] [submodule "qtsvg"]
depends = qtbase depends = qtbase
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
depends = qtbase depends = qtbase
recommends = qtsvg qtxmlpatterns recommends = qtsvg qtxmlpatterns
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
branch = 5.6 branch = 5.6
initrepo = true status = essential
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
depends = qtbase depends = qtbase
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtscript"] [submodule "qtscript"]
depends = qtbase depends = qtbase
recommends = qttools recommends = qttools
path = qtscript path = qtscript
url = ../qtscript.git url = ../qtscript.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = 5.6 branch = 5.6
initrepo = true status = essential
[submodule "qttools"] [submodule "qttools"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
branch = 5.6 branch = 5.6
initrepo = true status = essential
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
depends = qtbase depends = qtbase
path = qtxmlpatterns path = qtxmlpatterns
url = ../qtxmlpatterns.git url = ../qtxmlpatterns.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qttranslations"] [submodule "qttranslations"]
depends = qttools depends = qttools
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
branch = 5.6 branch = 5.6
initrepo = true status = essential
priority = 30 priority = 30
[submodule "qtdoc"] [submodule "qtdoc"]
depends = qtdeclarative depends = qtdeclarative
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = 5.6 branch = 5.6
initrepo = true status = essential
priority = 40 priority = 40
[submodule "qtrepotools"] [submodule "qtrepotools"]
path = qtrepotools path = qtrepotools
url = ../qtrepotools.git url = ../qtrepotools.git
branch = master branch = master
initrepo = true status = essential
qt = false qt = false
[submodule "qtwebkit"] [submodule "qtwebkit"]
depends = qtbase depends = qtbase
@@ -75,6 +75,7 @@
path = qtwebkit path = qtwebkit
url = ../qtwebkit.git url = ../qtwebkit.git
branch = 5.6 branch = 5.6
status = obsolete
project = WebKit.pro project = WebKit.pro
priority = 20 priority = 20
[submodule "qtwebkit-examples"] [submodule "qtwebkit-examples"]
@@ -82,12 +83,13 @@
path = qtwebkit-examples path = qtwebkit-examples
url = ../qtwebkit-examples.git url = ../qtwebkit-examples.git
branch = 5.6 branch = 5.6
status = obsolete
[submodule "qtqa"] [submodule "qtqa"]
depends = qtbase depends = qtbase
path = qtqa path = qtqa
url = ../qtqa.git url = ../qtqa.git
branch = master branch = master
initrepo = true status = essential
priority = 50 priority = 50
[submodule "qtlocation"] [submodule "qtlocation"]
depends = qtbase depends = qtbase
@@ -95,167 +97,174 @@
path = qtlocation path = qtlocation
url = ../qtlocation.git url = ../qtlocation.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtsensors"] [submodule "qtsensors"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtsystems"] [submodule "qtsystems"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtsystems path = qtsystems
url = ../qtsystems.git url = ../qtsystems.git
branch = dev branch = dev
status = ignore
[submodule "qtfeedback"] [submodule "qtfeedback"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtmultimedia recommends = qtmultimedia
path = qtfeedback path = qtfeedback
url = ../qtfeedback.git url = ../qtfeedback.git
branch = master branch = master
status = ignore
[submodule "qtdocgallery"] [submodule "qtdocgallery"]
depends = qtdeclarative depends = qtdeclarative
path = qtdocgallery path = qtdocgallery
url = ../qtdocgallery.git url = ../qtdocgallery.git
branch = master branch = master
status = ignore
[submodule "qtpim"] [submodule "qtpim"]
depends = qtdeclarative depends = qtdeclarative
path = qtpim path = qtpim
url = ../qtpim.git url = ../qtpim.git
branch = dev branch = dev
status = ignore
[submodule "qtconnectivity"] [submodule "qtconnectivity"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtandroidextras recommends = qtdeclarative qtandroidextras
path = qtconnectivity path = qtconnectivity
url = ../qtconnectivity.git url = ../qtconnectivity.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtwayland"] [submodule "qtwayland"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 5.6 branch = 5.6
initrepo = true status = preview
[submodule "qt3d"] [submodule "qt3d"]
depends = qtdeclarative qtimageformats depends = qtdeclarative qtimageformats
path = qt3d path = qt3d
url = ../qt3d.git url = ../qt3d.git
branch = 5.6 branch = 5.6
initrepo = true status = preview
[submodule "qtimageformats"] [submodule "qtimageformats"]
depends = qtbase depends = qtbase
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtquick1"] [submodule "qtquick1"]
depends = qtscript depends = qtscript
recommends = qtsvg qtxmlpatterns recommends = qtsvg qtxmlpatterns
path = qtquick1 path = qtquick1
url = ../qtquick1.git url = ../qtquick1.git
branch = 5.6 branch = 5.6
status = obsolete
[submodule "qtgraphicaleffects"] [submodule "qtgraphicaleffects"]
depends = qtdeclarative depends = qtdeclarative
path = qtgraphicaleffects path = qtgraphicaleffects
url = ../qtgraphicaleffects.git url = ../qtgraphicaleffects.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtquickcontrols"] [submodule "qtquickcontrols"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtgraphicaleffects recommends = qtgraphicaleffects
path = qtquickcontrols path = qtquickcontrols
url = ../qtquickcontrols.git url = ../qtquickcontrols.git
branch = 5.6 branch = 5.6
initrepo = true status = essential
[submodule "qtserialbus"] [submodule "qtserialbus"]
depends = qtserialport depends = qtserialport
path = qtserialbus path = qtserialbus
url = ../qtserialbus.git url = ../qtserialbus.git
branch = 5.6 branch = 5.6
status = preview
[submodule "qtserialport"] [submodule "qtserialport"]
depends = qtbase depends = qtbase
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtx11extras"] [submodule "qtx11extras"]
depends = qtbase depends = qtbase
path = qtx11extras path = qtx11extras
url = ../qtx11extras.git url = ../qtx11extras.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtmacextras"] [submodule "qtmacextras"]
depends = qtbase depends = qtbase
path = qtmacextras path = qtmacextras
url = ../qtmacextras.git url = ../qtmacextras.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtwinextras"] [submodule "qtwinextras"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtwinextras path = qtwinextras
url = ../qtwinextras.git url = ../qtwinextras.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtandroidextras"] [submodule "qtandroidextras"]
depends = qtbase depends = qtbase
path = qtandroidextras path = qtandroidextras
url = ../qtandroidextras.git url = ../qtandroidextras.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtenginio"] [submodule "qtenginio"]
depends = qtdeclarative depends = qtdeclarative
path = qtenginio path = qtenginio
url = ../qtenginio.git url = ../qtenginio.git
branch = 5.6 branch = 5.6
initrepo = true status = obsolete
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtwebsockets recommends = qtdeclarative qtwebsockets
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtwebengine"] [submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel depends = qtquickcontrols qtwebchannel
recommends = qtlocation recommends = qtlocation
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
priority = 10 priority = 10
[submodule "qtcanvas3d"] [submodule "qtcanvas3d"]
depends = qtdeclarative depends = qtdeclarative
path = qtcanvas3d path = qtcanvas3d
url = ../qtcanvas3d.git url = ../qtcanvas3d.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtwebview"] [submodule "qtwebview"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtwebengine recommends = qtwebengine
path = qtwebview path = qtwebview
url = ../qtwebview.git url = ../qtwebview.git
branch = 5.6 branch = 5.6
initrepo = true status = addon
[submodule "qtquickcontrols2"] [submodule "qtquickcontrols2"]
depends = qtquickcontrols depends = qtquickcontrols
path = qtquickcontrols2 path = qtquickcontrols2
url = ../qtquickcontrols2.git url = ../qtquickcontrols2.git
branch = 5.6 branch = 5.6
initrepo = true status = preview
[submodule "qtpurchasing"] [submodule "qtpurchasing"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtpurchasing path = qtpurchasing
url = ../qtpurchasing.git url = ../qtpurchasing.git
branch = 5.6 branch = dev
status = ignore

47
init-repository
View File

@@ -71,9 +71,12 @@ Options:
--module-subset=<module1>,<module2>... --module-subset=<module1>,<module2>...
Only initialize the specified subset of modules given as the Only initialize the specified subset of modules given as the
argument. Specified modules must already exist in .gitmodules. The argument. Specified modules must already exist in .gitmodules. The
string "all" results in cloning all known modules. The default is string "all" results in cloning all known modules. The strings
the set of maintained modules. Module names may be prefixed with a "essential", "addon", "preview", "obsolete", and "ignore" refer to
dash to exclude them from a bigger set. 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 --no-update
Skip the `git submodule update' command. Skip the `git submodule update' command.
@@ -234,6 +237,7 @@ sub parse_arguments
# Replace any double trailing slashes from end of mirror # Replace any double trailing slashes from end of mirror
$self->{'mirror-url'} =~ s{//+$}{/}; $self->{'mirror-url'} =~ s{//+$}{/};
$self->{'module-subset'} =~ s/\bdefault\b/preview,essential,addon/;
$self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ]; $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ];
return; return;
@@ -272,6 +276,13 @@ sub git_submodule_init
return; return;
} }
use constant {
STS_PREVIEW => 1,
STS_ESSENTIAL => 2,
STS_ADDON => 3,
STS_OBSOLETE => 4
};
sub git_clone_all_submodules sub git_clone_all_submodules
{ {
my ($self, $my_repo_base, $co_branch, @subset) = @_; my ($self, $my_repo_base, $co_branch, @subset) = @_;
@@ -296,8 +307,20 @@ sub git_clone_all_submodules
$subbases{$mod} = $base; $subbases{$mod} = $base;
} elsif ($2 eq "update") { } elsif ($2 eq "update") {
push @subset, '-'.$1 if ($3 eq 'none'); push @subset, '-'.$1 if ($3 eq 'none');
} elsif ($2 eq "initrepo") { } elsif ($2 eq "status") {
$subinits{$1} = ($3 eq "yes" or $3 eq "true"); 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,11 +328,21 @@ sub git_clone_all_submodules
foreach my $mod (@subset) { foreach my $mod (@subset) {
if ($mod eq "all") { if ($mod eq "all") {
map { $include{$_} = 1; } keys %subbases; map { $include{$_} = 1; } keys %subbases;
} elsif ($mod eq "default") { } elsif ($mod eq "essential") {
map { $include{$_} = 1; } grep { $subinits{$_} } keys %subbases; 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/^-//) { } elsif ($mod =~ s/^-//) {
print "Warning: excluding non-existent module '$mod'.\n"
if (!defined($subdirs{$mod}));
delete $include{$mod}; delete $include{$mod};
} else { } else {
die("Error: module subset names non-existent '$mod'.\n")
if (!defined($subdirs{$mod}));
$include{$mod} = 1; $include{$mod} = 1;
} }
} }