summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2012-05-08 14:43:41 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-15 09:10:56 +0200
commit4b497e1de49c0c10644706763c34bb4c3b681f8b (patch)
tree429bde22f4dfc7561e3f6480f85536f4491259e2 /qt.pro
parentf1409e7b02097823f8f0b4e56a12d3ef99f29084 (diff)
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 <rohan.mcgovern@nokia.com>
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro9
1 files changed, 7 insertions, 2 deletions
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