aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2018-10-15 16:31:43 +0200
committerLiang Qi <liang.qi@qt.io>2018-10-16 13:59:23 +0000
commitb365b3853e85eb985f769a8b772cc1165bfe590c (patch)
tree9f97e924fc6ce6b550f292d323eeb7fc422d74da /.gitmodules
parent9573b78b5667c7ed6a8d742e2687e107844343bd (diff)
Make quickcontrols1/2 and webchannel optional for webengine
Fixes: QTBUG-70784 Change-Id: I845216123f7638afd69b39d5da8020a449ab40b8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index eeba9f34..1c21bce2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -210,8 +210,8 @@
branch = 5.12
status = addon
[submodule "qtwebengine"]
- depends = qtquickcontrols qtwebchannel
- recommends = qtlocation qttools
+ depends = qtdeclarative
+ recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel
path = qtwebengine
url = ../qtwebengine.git
branch = 5.12