diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-22 23:21:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-22 23:21:54 +0100 |
| commit | 0e82de327b0f764b1d48721d396189b10a36eaef (patch) | |
| tree | 6a0bd66602977f62618b1c3325afb79850b11290 /.gitmodules | |
| parent | db99f0563d6c3998a3cfd2b9521a7893564e981d (diff) | |
| parent | 061cf1f2ca98b961746784382e354208f3fc97f1 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 1c21bce2..7657f30f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -211,7 +211,7 @@ status = addon [submodule "qtwebengine"] depends = qtdeclarative - recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel + recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git branch = 5.12 @@ -297,11 +297,11 @@ path = qtremoteobjects url = ../qtremoteobjects.git branch = 5.12 - status = preview + status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git branch = 5.12 - status = preview + status = addon |