diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-08 21:35:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-08 19:51:16 +0000 |
| commit | b80fa7bc4cbb74c5ab01186a1cb0392cc7569128 (patch) | |
| tree | 2f46b53edbc0d4d3e30c1ed7830d03704fbe8f8a | |
| parent | 6720096ee09a1eaab372d45402f64845f247df7f (diff) | |
| parent | 5656b4848e8c8bf60274c36094dede63aa93e89b (diff) | |
| download | qt5-b80fa7bc4cbb74c5ab01186a1cb0392cc7569128.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
.gitmodules
qt.pro
Commit ed8f84f149f6901cbca50d145b25fe5f43a2d54c (webengine needs tools)
together with commit 5656b4848e8c8bf60274c36094dede63aa93e89b (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
| -rw-r--r-- | .gitmodules | 1 | ||||
| -rwxr-xr-x | init-repository | 2 | ||||
| -rw-r--r-- | qt.pro | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index f3230e8d..8be71f45 100644 --- a/.gitmodules +++ b/.gitmodules @@ -238,6 +238,7 @@ [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools + serialize = qtwebkit path = qtwebengine url = ../qtwebengine.git branch = 5.9 diff --git a/init-repository b/init-repository index ff3390f8..861511b9 100755 --- a/init-repository +++ b/init-repository @@ -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'); @@ -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'.") |