aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules1
-rw-r--r--qt.pro4
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 9bcdf4ce..b4d74220 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -72,6 +72,7 @@
[submodule "qtwebkit"]
depends = qtbase
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
+ serialize = qtwebengine
path = qtwebkit
url = ../qtwebkit.git
branch = 5.6
diff --git a/qt.pro b/qt.pro
index f8d3d4d3..bf510fab 100644
--- a/qt.pro
+++ b/qt.pro
@@ -26,14 +26,14 @@ for (line, lines) {
}
QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules
-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'.")