summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2017-01-16 14:21:47 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2017-02-03 05:46:43 +0000
commit713188e4af7d99e4b04b5270b13fbb3b786d4edc (patch)
treefeabcea2b1e483142c905e0e84c276661726ac45
parent0c8536fc0a22bb071cecaa9165cce5586f4ff55b (diff)
Revert "Clean up usage of qtsvg as dependency"
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>
-rw-r--r--.gitmodules6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index 6dc85870..9bcdf4ce 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.6
@@ -100,7 +100,7 @@
status = addon
[submodule "qtsensors"]
depends = qtbase
- recommends = qtdeclarative qtsvg
+ recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.6
@@ -159,7 +159,7 @@
status = addon
[submodule "qtquick1"]
depends = qtscript
- recommends = qtxmlpatterns
+ recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = 5.6