From 9985003ac4a42adfa35db286eda1b2ae9656d85b Mon Sep 17 00:00:00 2001 From: Toby Tomkins Date: Thu, 17 May 2012 15:10:49 +1000 Subject: qt.pro: change qtfeedback dependency on qtmultimedia to optional. qtfeeback currently has a hard dependency on qtmultimedia. qtfeedback only uses multimedia in the mmk plugin. This change modifies the build system only as all the required infrastructure changes in qtfeedback are already present. Change-Id: Ie9884dfd51fb040cde3e29247f1f51ea7f0bd637 Reviewed-by: Rohan McGovern Reviewed-by: Sergio Ahumada --- qt.pro | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index dc2740b7..839bcd96 100644 --- a/qt.pro +++ b/qt.pro @@ -82,7 +82,7 @@ module_qtmultimedia.depends = module_qtbase module_qtdeclarative module_qtfeedback.subdir = qtfeedback module_qtfeedback.target = module-qtfeedback -module_qtfeedback.depends = module_qtbase module_qtmultimedia module_qtdeclarative +module_qtfeedback.depends = module_qtbase module_qtdeclarative module_qt3d.subdir = qt3d module_qt3d.target = module-qt3d @@ -158,7 +158,10 @@ exists(qtsystems/qtsystems.pro) { module_qtlocation.depends += module_qtsystems } exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon -exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia +exists(qtmultimedia/qtmultimedia.pro) { + SUBDIRS += module_qtmultimedia + module_qtfeedback.depends += module_qtmultimedia +} exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim -- cgit v1.2.3