diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-09 09:01:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-09 09:02:41 +0200 |
| commit | 49c808befbc2147b84e781de4994a9b9b37beca8 (patch) | |
| tree | 10b041f8a634340dfb569506293431b2ce873d25 /.gitmodules | |
| parent | 9e370453bbff7510bb723f9333428c756d9942dc (diff) | |
| parent | f32c9f755edf4dd75ec8bd3066c11e37ab6e1e84 (diff) | |
Merge remote-tracking branch 'origin/5.13.1' into 5.13
Conflicts:
.gitmodules
Change-Id: I9b4e8807941f49ed930372cc3466c97110794849
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index c6e10304..2f6addc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = 5.13 - status = ignore + status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative @@ -265,7 +265,7 @@ path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 5.13 - status = ignore + status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative |