From e3c8992faed366efdf912d46572dbb873f4af351 Mon Sep 17 00:00:00 2001 From: Toby Tomkins Date: Thu, 8 Mar 2012 12:52:40 +1000 Subject: 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 Reviewed-by: Alan Alpert --- qt.pro | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'qt.pro') 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 -- cgit v1.2.3