diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-04 14:20:27 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-02-04 14:20:27 +0000 |
| commit | bbdeca02e90ad47aecd15426bf76b24c23733d64 (patch) | |
| tree | b3facb6b919e36ff27f0d8290e2430c7e6458a40 /.gitmodules | |
| parent | 4b45cd68d4f365c0025ca19611f35660361e8d76 (diff) | |
| parent | d641d6546ba36aea2f527cca852b04fcf2a97f6d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.8" into refs/staging/5.8
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 58692759..f044480c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ status = addon [submodule "qtdeclarative"] depends = qtbase - recommends = qtxmlpatterns + recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = 5.8 @@ -100,7 +100,7 @@ status = addon [submodule "qtsensors"] depends = qtbase - recommends = qtdeclarative qtsvg + recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = 5.8 @@ -160,7 +160,7 @@ status = addon [submodule "qtquick1"] depends = qtscript - recommends = qtxmlpatterns + recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = dev |