diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-08 15:31:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-08 15:31:47 +0200 |
| commit | 03d4a54e34c2e53dbdda15f7d9a1aa6442e81246 (patch) | |
| tree | 468f70dead4e9bbdaa8cb45302dc9c4e1821ad40 /.gitmodules | |
| parent | f511a2d74ff298989d48a1ee409b0de1e4d21869 (diff) | |
| parent | 42bfac5bf847cc7505d0bf5be2aff179ed2ed28e (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13.1
Conflicts:
.gitmodules
coin/platform_configs/qtbase.yaml
Change-Id: I964ffb430436c62ad675fabc853642800499ade3
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 4a2679fa..c59f64ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -265,7 +265,7 @@ path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 5.13.1 - status = ignore + status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative |