diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-06 11:46:15 +0200 |
| commit | 13b206662bf3c3cb5eaf2e977d457fd1a7c3fa50 (patch) | |
| tree | 7e7ea027376ad0dbf9f5f65ae18e03e0f30cde5f /.gitmodules | |
| parent | a268fb46895f694a58da2389fd47ca393a68deef (diff) | |
| parent | 2fb0e4f3521327d7d44b012316fb9e79c11f4366 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.13.1
Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.
Conflicts:
.gitmodules
Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 1aa79a80..4a2679fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,7 +216,7 @@ path = qtwebengine url = ../qtwebengine.git branch = 5.13.1 - status = addon + status = ignore priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative @@ -265,7 +265,7 @@ path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 5.13.1 - status = addon + status = ignore [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative |