Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Enable Sensors and Location API builds by default
This commit is contained in:
Qt Continuous Integration System
2011-06-06 17:24:30 +10:00

4
qt.pro
View File

@@ -68,14 +68,10 @@ module_qtqa.depends = module_qtbase
module_qtlocation.subdir = $$IN_PWD/qtlocation
module_qtlocation.target = module-qtlocation
module_qtlocation.depends = module_qtbase module_qtdeclarative
# not yet enabled by default
module_qtlocation.CONFIG = no_default_target no_default_install
module_qtsensors.subdir = $$IN_PWD/qtsensors
module_qtsensors.target = module-qtsensors
module_qtsensors.depends = module_qtbase module_qtdeclarative
# not yet enabled by default
module_qtsensors.CONFIG = no_default_target no_default_install
SUBDIRS = \
module_qtbase \