diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-17 11:41:55 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-17 11:41:55 +0100 |
| commit | acd40269d395d8dacc050cf6401fec2785188158 (patch) | |
| tree | f1da64393e0f68f352b83d1170bcd6f4676310bc /.gitmodules | |
| parent | f8e075a67932714c35764b098045c276c26c0c2e (diff) | |
| parent | 98c92cc95f82a0998eed4d36f8b3ed6277be8ca2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index b24ddfc7..74081669 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.7 @@ -100,7 +100,7 @@ status = addon [submodule "qtsensors"] depends = qtbase - recommends = qtdeclarative + recommends = qtdeclarative qtsvg path = qtsensors url = ../qtsensors.git branch = 5.7 @@ -160,7 +160,7 @@ status = addon [submodule "qtquick1"] depends = qtscript - recommends = qtsvg qtxmlpatterns + recommends = qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = 5.7 |