lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-30 18:27:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Qt Location dependencies.

Browse Source 
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>
This commit is contained in:
Aaron McCarthy
2012-05-08 14:43:41 +10:00
committed by Qt by Nokia
parent f1409e7b02
commit 4b497e1de4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
qt.pro
View File

@@ -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