diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-20 14:17:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-20 14:17:57 +0200 |
| commit | 16c6fa419a9c16ea5573eb5080c4241739a36c8b (patch) | |
| tree | 68f1b3072e4ca38576fe50c796ea08e11b4ff8aa /.gitmodules | |
| parent | 0345ab91fbce6e5a11a9f1a05ec8f50ae4bcade5 (diff) | |
| parent | 4667cfc432a97bf0400c2e4ecf2c1fbd535eae63 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I34a18e1ea9ca774638ffe65d08d1fee46efba4aa
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index bd5a2734..28545ab3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -210,8 +210,8 @@ branch = dev status = addon [submodule "qtwebengine"] - depends = qtquickcontrols qtwebchannel - recommends = qtlocation qttools + depends = qtdeclarative + recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel path = qtwebengine url = ../qtwebengine.git branch = dev |