summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules1
-rwxr-xr-xinit-repository2
-rw-r--r--qt.pro4
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');
diff --git a/qt.pro b/qt.pro
index 49901139..373b60c9 100644
--- a/qt.pro
+++ b/qt.pro
@@ -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'.")