From 5656b4848e8c8bf60274c36094dede63aa93e89b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 6 Feb 2017 20:48:22 +0100 Subject: 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 --- .gitmodules | 1 + 1 file changed, 1 insertion(+) (limited to '.gitmodules') 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 -- cgit v1.2.3