diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-07-29 15:58:23 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-29 10:13:46 +0200 |
| commit | f647b029e864a7008ab7a3f03431d90ef51101d7 (patch) | |
| tree | c16ebe20b257bbf6ff5011eef264582550389345 | |
| parent | 168e0b43fb943240c7aa93e21ca19feb3a33150c (diff) | |
Small cleanups on dependencies and such.
Change-Id: Ie01727ac318721c44cafd11ba0a7a138ab9f9c33
Reviewed-on: http://codereview.qt.nokia.com/2375
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
| -rw-r--r-- | modules/qt_sensors.pri | 2 | ||||
| -rw-r--r-- | qtsensors.pro | 4 | ||||
| -rw-r--r-- | sync.profile | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/modules/qt_sensors.pri b/modules/qt_sensors.pri index c85a92d4..a67da06a 100644 --- a/modules/qt_sensors.pri +++ b/modules/qt_sensors.pri @@ -11,7 +11,7 @@ QT.sensors.sources = $$QT_MODULE_BASE/src/sensors QT.sensors.libs = $$QT_MODULE_LIB_BASE QT.sensors.plugins = $$QT_MODULE_PLUGIN_BASE QT.sensors.imports = $$QT_MODULE_IMPORT_BASE -QT.sensors.depends = gui sql network +QT.sensors.depends = core QT.sensors.DEFINES = QT_SENSORS_LIB QT_CONFIG += sensors diff --git a/qtsensors.pro b/qtsensors.pro index f5040084..96d2e940 100644 --- a/qtsensors.pro +++ b/qtsensors.pro @@ -1,8 +1,10 @@ TEMPLATE = subdirs +SUBDIRS += module_qtsensors_src module_qtsensors_src.subdir = src module_qtsensors_src.target = module-qtsensors-src +SUBDIRS += module_qtsensors_tests module_qtsensors_tests.subdir = tests module_qtsensors_tests.target = module-qtsensors-tests module_qtsensors_tests.depends = module_qtsensors_src @@ -10,5 +12,3 @@ module_qtsensors_tests.depends = module_qtsensors_src module_qtsensors_tests.CONFIG = no_default_target no_default_install } -SUBDIRS += module_qtsensors_src \ - module_qtsensors_tests diff --git a/sync.profile b/sync.profile index 098606fe..b309f724 100644 --- a/sync.profile +++ b/sync.profile @@ -7,17 +7,10 @@ "qtsensorsversion.h" => "QtSensorsVersion", ); %mastercontent = ( - "declarative" => "#include <QtDeclarative/qdeclarative.h>\n", ); %modulepris = ( "QtSensors" => "$basedir/modules/qt_sensors.pri", ); -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# %dependencies = ( "qtbase" => "refs/heads/master", "qtscript" => "refs/heads/master", |