diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-02 09:01:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-02 09:02:23 +0100 |
| commit | 2c27ccd1c9a821edd071cae6336ecb2066ce2ab7 (patch) | |
| tree | faabf3a283501256bd3c4065273a651174657736 /.gitmodules | |
| parent | aed00a8dd39786519bdf5b6f5627cad6c006a8ce (diff) | |
| parent | d379d768e6b9e6d9b432117ad8c803ce7ed9e7e5 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8.0
Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index b7825aa5..f45d1e6b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ status = addon [submodule "qtdeclarative"] depends = qtbase - recommends = qtsvg qtxmlpatterns + recommends = qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = 5.8.0 @@ -100,7 +100,7 @@ status = addon [submodule "qtsensors"] depends = qtbase - recommends = qtdeclarative + recommends = qtdeclarative qtsvg path = qtsensors url = ../qtsensors.git branch = 5.8.0 @@ -160,7 +160,7 @@ status = addon [submodule "qtquick1"] depends = qtscript - recommends = qtsvg qtxmlpatterns + recommends = qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = dev |