Revert "Clean up usage of qtsvg as dependency"
authorFrederik Gladhorn <frederik.gladhorn@qt.io>
Mon, 16 Jan 2017 13:21:47 +0000 (14:21 +0100)
committerSimon Hausmann <simon.hausmann@qt.io>
Fri, 3 Feb 2017 05:46:43 +0000 (05:46 +0000)
qtdeclarative has a runtime dependency, some tests rely on the svg
module being available, so in order to not reduce the test coverage,
revert this change.
I'd like to see a better/cleaner separation, but for the time being,
better coverage wins.

This reverts commit fbd782636b6ee413d2b6e8bca408263297194254.

Change-Id: I60d6b585e25e2e7c4f6ad705b754279968827842
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
.gitmodules

index 6dc8587..9bcdf4c 100644 (file)
@@ -11,7 +11,7 @@
        status = addon
 [submodule "qtdeclarative"]
        depends = qtbase
-       recommends = qtxmlpatterns
+       recommends = qtsvg qtxmlpatterns
        path = qtdeclarative
        url = ../qtdeclarative.git
        branch = 5.6
        status = addon
 [submodule "qtsensors"]
        depends = qtbase
-       recommends = qtdeclarative qtsvg
+       recommends = qtdeclarative
        path = qtsensors
        url = ../qtsensors.git
        branch = 5.6
        status = addon
 [submodule "qtquick1"]
        depends = qtscript
-       recommends = qtxmlpatterns
+       recommends = qtsvg qtxmlpatterns
        path = qtquick1
        url = ../qtquick1.git
        branch = 5.6