diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-03 09:15:43 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-03 09:15:43 +0100 |
| commit | d641d6546ba36aea2f527cca852b04fcf2a97f6d (patch) | |
| tree | 50ef91108a67410e5ed4d69187df44e580ea98d5 /.gitmodules | |
| parent | 321d5f1488938ad80f207a03a02101ebbf8ce763 (diff) | |
| parent | a36977963a9b6fad940f6ae8395401ce567f4b49 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.8
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
Change-Id: I10fcdfc0af68741d931f4732783bafdad2fffc4a
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 |