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

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

Browse Source 
Conflicts:
	.gitmodules
	qt.pro

Commit ed8f84f149 (webengine needs tools)
together with commit 5656b4848e (webkit
needs webengine) creates a circular dependency with qttools also
depending on webkit. So this commit breaks it by swapping the
serialization order between webkit and webengine.

Change-Id: I36309908adb754072495e02785ad158f8b389548
This commit is contained in:
Liang Qi
2017-04-08 21:35:45 +02:00
committed by Simon Hausmann
parent 6720096ee0 5656b4848e
commit b80fa7bc4c
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitmodules vendored
View File

@@ -238,6 +238,7 @@
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools
serialize = qtwebkit
path = qtwebengine
url = ../qtwebengine.git
branch = 5.9

2
init-repository
View File

@@ -316,7 +316,7 @@ sub git_clone_all_submodules
my ($mod, $base) = ($1, $3);
next if ($base !~ /^\.\.\//);
$base = $my_repo_base.'/'.$base;
while ($base =~ s,/(?!\.\./)[^/]+/\.\./,/,g) {}
while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {}
$subbases{$mod} = $base;
} elsif ($2 eq "update") {
push @subset, '-'.$1 if ($3 eq 'none');

4
qt.pro
View File

@@ -43,14 +43,14 @@ for (ever) {
}
}
modules = $$sort_depends(modules, module., .depends .recommends)
modules = $$sort_depends(modules, module., .depends .recommends .serialize)
modules = $$reverse(modules)
for (mod, modules) {
equals(module.$${mod}.qt, false): \
next()
deps = $$eval(module.$${mod}.depends)
recs = $$eval(module.$${mod}.recommends)
recs = $$eval(module.$${mod}.recommends) $$eval(module.$${mod}.serialize)
for (d, $$list($$deps $$recs)): \
!contains(modules, $$d): \
error("'$$mod' depends on undeclared '$$d'.")