diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-05 15:16:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-05 15:17:50 +0100 |
| commit | 527829a600fd5fdecdbadaa2a4828ea61c3b1dfa (patch) | |
| tree | e2f936a6548a094b0cf213e142a77d117ac587d9 /.gitmodules | |
| parent | 2c1d5ad75440f2a8304dec385a63baf9d2e4ed36 (diff) | |
| parent | bbdeca02e90ad47aecd15426bf76b24c23733d64 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index bb057ac6..c28d5667 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.9 @@ -100,7 +100,7 @@ status = addon [submodule "qtsensors"] depends = qtbase - recommends = qtdeclarative qtsvg + recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = 5.9 @@ -160,7 +160,7 @@ status = addon [submodule "qtquick1"] depends = qtscript - recommends = qtxmlpatterns + recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = dev |