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

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

Browse Source 
Conflicts:
	.gitmodules

Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
This commit is contained in:
Liang Qi
2016-04-05 09:52:18 +02:00
parent a550ad21bf e80d89059c
commit 5758a88e59
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -28,7 +28,7 @@
path = qtscript path = qtscript
url = ../qtscript.git url = ../qtscript.git
branch = 5.7 branch = 5.7
status = addon status = deprecated
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
@@ -220,7 +220,7 @@
path = qtenginio path = qtenginio
url = ../qtenginio.git url = ../qtenginio.git
branch = 5.7 branch = 5.7
status = obsolete status = deprecated
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative

20
init-repository
View File

@@ -72,11 +72,12 @@ Options:
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 strings string "all" results in cloning all known modules. The strings
"essential", "addon", "preview", "obsolete", and "ignore" refer to "essential", "addon", "preview", "deprecated", "obsolete", and
classes of modules; "default" maps to "essential,addon,preview", "ignore" refer to classes of modules; "default" maps to
which corresponds with the set of maintained modules and is also "essential,addon,preview,deprecated", which corresponds with the
the default set. Module names may be prefixed with a dash to set of maintained modules and is also the default set. Module
exclude them from a bigger set, e.g. "all,-ignore". 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.
@@ -240,7 +241,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'} =~ s/\bdefault\b/preview,essential,addon,deprecated/;
$self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ]; $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ];
return; return;
@@ -283,7 +284,8 @@ use constant {
STS_PREVIEW => 1, STS_PREVIEW => 1,
STS_ESSENTIAL => 2, STS_ESSENTIAL => 2,
STS_ADDON => 3, STS_ADDON => 3,
STS_OBSOLETE => 4 STS_DEPRECATED => 4,
STS_OBSOLETE => 5
}; };
sub git_clone_all_submodules sub git_clone_all_submodules
@@ -317,6 +319,8 @@ sub git_clone_all_submodules
$subinits{$1} = STS_ESSENTIAL; $subinits{$1} = STS_ESSENTIAL;
} elsif ($3 eq "addon") { } elsif ($3 eq "addon") {
$subinits{$1} = STS_ADDON; $subinits{$1} = STS_ADDON;
} elsif ($3 eq "deprecated") {
$subinits{$1} = STS_DEPRECATED;
} elsif ($3 eq "obsolete") { } elsif ($3 eq "obsolete") {
$subinits{$1} = STS_OBSOLETE; $subinits{$1} = STS_OBSOLETE;
} elsif ($3 eq "ignore") { } elsif ($3 eq "ignore") {
@@ -337,6 +341,8 @@ sub git_clone_all_submodules
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases; map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
} elsif ($mod eq "preview") { } elsif ($mod eq "preview") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases; map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
} elsif ($mod eq "deprecated") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_DEPRECATED } keys %subbases;
} elsif ($mod eq "obsolete") { } elsif ($mod eq "obsolete") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases; map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases;
} elsif ($mod =~ s/^-//) { } elsif ($mod =~ s/^-//) {