summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2012-03-08 12:52:40 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-13 02:47:16 +0100
commite3c8992faed366efdf912d46572dbb873f4af351 (patch)
treed3d4947efe99d180c29f1b3640866f06ab6cb70b /qt.pro
parent1d8dd4cffc93d619de473f3b9082923bfeaa5eab (diff)
QtSVG: Add dependency to declarative and quick1 if qtsvg is available.
Currently there is a soft dependency on qtsvg that causes a build of qt5 to have unknown build order for qtsvg and other modules. This change makes it a hard dependency if the qtsvg module is available. Change-Id: Ic58a63f3f5f1d813ba832455c1ad3af41599926b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro7
1 files changed, 6 insertions, 1 deletions
diff --git a/qt.pro b/qt.pro
index 5cc76c4a..d64c62f0 100644
--- a/qt.pro
+++ b/qt.pro
@@ -131,7 +131,12 @@ module_qtgraphicaleffects.CONFIG = no_default_target no_default_install
SUBDIRS = module_qtbase
-exists(qtsvg/qtsvg.pro): SUBDIRS += module_qtsvg
+exists(qtsvg/qtsvg.pro) {
+ SUBDIRS += module_qtsvg
+ # These modules do not require qtsvg, but can use it if it is available
+ module_qtdeclarative.depends += module_qtsvg
+ module_qtquick1.depends += module_qtsvg
+}
exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon
exists(qtxmlpatterns/qtxmlpatterns.pro): SUBDIRS += module_qtxmlpatterns
exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript