summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-02-06 20:48:22 +0100
committerKonstantin Tokarev <annulen@yandex.ru>2017-04-06 21:56:25 +0000
commit5656b4848e8c8bf60274c36094dede63aa93e89b (patch)
tree613322285a33efe1aa988eedf143a43fb1eeabb0 /.gitmodules
parent315b76dc9b48456018490675339c084b9e17b2d0 (diff)
serialize build of qtwebkit and qtwebengine
linking both at the same time requires more than my 16GB of RAM, so introduce a .gitmodules field which serializes the two. in practice, it is just interpreted as an optional dependency. the CI system won't be taught about it, so this will not cause an unnecessary serialization there. Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules1
1 files changed, 1 insertions, 0 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