summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-04-08 21:35:45 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-04-08 19:51:16 +0000
commitb80fa7bc4cbb74c5ab01186a1cb0392cc7569128 (patch)
tree2f46b53edbc0d4d3e30c1ed7830d03704fbe8f8a /.gitmodules
parent6720096ee09a1eaab372d45402f64845f247df7f (diff)
parent5656b4848e8c8bf60274c36094dede63aa93e89b (diff)
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
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules1
1 files changed, 1 insertions, 0 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