diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-14 08:40:10 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-01-14 08:40:10 +0100 |
| commit | a34d81258006375757941480c0b8ab90073ecfb3 (patch) | |
| tree | b8b4753c8f7a14926d019e409579c84f9fd1e618 /.gitmodules | |
| parent | 4d206f1fb613df82768b6276b1bb317d2c85c9ad (diff) | |
| parent | 9de5f6957ce9ed1e9d1216dadc755f07783a3870 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
dev branch.
This is done within the same change as the merge to preserve atomicity.
Task-number: QTQAINFRA-1074
Change-Id: Ic47f7db3506ace4faca028b902d48cdb009c8495
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 79aca023..625289c3 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 = dev @@ -100,7 +100,7 @@ status = addon [submodule "qtsensors"] depends = qtbase - recommends = qtdeclarative + recommends = qtdeclarative qtsvg path = qtsensors url = ../qtsensors.git branch = dev @@ -160,7 +160,7 @@ status = addon [submodule "qtquick1"] depends = qtscript - recommends = qtsvg qtxmlpatterns + recommends = qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = dev |