diff options
author | Liang Qi <liang.qi@qt.io> | 2019-01-02 10:46:49 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-01-02 10:46:49 +0100 |
commit | 38e2fc6b808186b41183b6e4601c086dc81d35bf (patch) | |
tree | c1b2faecf005d02b94a1f8c2cd423aff3a06c78d /.gitmodules | |
parent | da65a37041aa35a719130050cebad3ea0356e059 (diff) | |
parent | b6283a31c8db19d6d1939957a503e25b98394507 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.gitmodules
coin/provisioning/common/linux/docker_testserver.sh
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Done-With: Ryan Chu <ryan.chu@qt.io>
Change-Id: I9bc3afcb50783a9f0f7718731d237de4be287cae
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 64eeb1f2..72184220 100644 --- a/.gitmodules +++ b/.gitmodules @@ -212,7 +212,7 @@ status = addon [submodule "qtwebengine"] depends = qtdeclarative - recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel + recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git branch = dev @@ -298,11 +298,11 @@ path = qtremoteobjects url = ../qtremoteobjects.git branch = dev - status = preview + status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git branch = dev - status = preview + status = addon |