diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-08-31 16:32:13 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-31 16:32:13 +0200 |
| commit | 5024bd5725b15d52e7164cb797c0a1cabe691f22 (patch) | |
| tree | 0192bb45d26a1311abff4e1509dbade62432d987 /.gitmodules | |
| parent | 90e3bb68e6f8f8f36616c598295e51be0bbdb807 (diff) | |
| parent | 2e6a5787ef6265fb7aeb4af1384a5e3bf63ed49e (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6c3472a0a6c7f1da8e7320cab5cc9b098bd574ba
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 3449e50c..bd5a2734 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ status = addon [submodule "qtdeclarative"] depends = qtbase - recommends = qtsvg qtxmlpatterns + recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git branch = dev @@ -45,6 +45,7 @@ status = essential [submodule "qtxmlpatterns"] depends = qtbase + recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git branch = dev |