From 4b497e1de49c0c10644706763c34bb4c3b681f8b Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Tue, 8 May 2012 14:43:41 +1000 Subject: Fix Qt Location dependencies. Qt Location has a soft dependency on qtjsondb. Declare a new soft dependency on qtsystems. This dependency is dependent on whether location shifting support for China is enabled. By default it is not. Change-Id: Id41451adb14e3c6cee0728ff343be85399fc4ac5 Reviewed-by: Rohan McGovern --- qt.pro | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'qt.pro') diff --git a/qt.pro b/qt.pro index 7939da77..b39ed9d3 100644 --- a/qt.pro +++ b/qt.pro @@ -66,7 +66,7 @@ module_qtqa.depends = module_qtbase module_qtlocation.subdir = qtlocation module_qtlocation.target = module-qtlocation -module_qtlocation.depends = module_qtbase module_qtdeclarative module_qt3d module_qtjsondb +module_qtlocation.depends = module_qtbase module_qtdeclarative module_qt3d module_qtsensors.subdir = qtsensors module_qtsensors.target = module-qtsensors @@ -148,10 +148,15 @@ exists(qtjsondb/qtjsondb.pro) { module_qtpim.depends += module_qtjsondb module_qtdocgallery.depends += module_qtjsondb module_qtsystems.depends += module_qtjsondb + module_qtlocation.depends += module_qtjsondb } exists(qtlocation/qtlocation.pro): SUBDIRS += module_qtlocation exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors -exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems +exists(qtsystems/qtsystems.pro) { + SUBDIRS += module_qtsystems + # These modules do not require qtsystems, but can use it if it is available + module_qtlocation.depends += module_qtsystems +} exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback -- cgit v1.2.3