diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-15 13:36:54 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-15 13:36:54 +1000 |
| commit | 5cd84fbc2c914efc60f01438538908935377ff6b (patch) | |
| tree | 6ffb0c8ff2b19a3e243e0e74f9faf7033c72802b | |
| parent | f2ee6d5f4d55434ae16bae7906b5c80e09994b81 (diff) | |
| parent | 54c829ac0b3da59390763b25ed0fd5d1116ec66b (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging:
add missing tests.pro
remove old qmake debug code and obsolete include paths
honour the configure -nomake tests/demos/examples flags in qtlocation
| -rw-r--r-- | qtlocation.pro | 12 | ||||
| -rw-r--r-- | src/plugins/geoservices/nokia/nokia.pro | 6 | ||||
| -rw-r--r-- | tests/tests.pro | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/qtlocation.pro b/qtlocation.pro index a5d63662..95a619f2 100644 --- a/qtlocation.pro +++ b/qtlocation.pro @@ -6,18 +6,26 @@ module_qtlocation_src.target = module-qtlocation-src module_qtlocation_demos.subdir = demos module_qtlocation_demos.target = module-qtlocation-demos module_qtlocation_demos.depends = module_qtlocation_src +!contains(QT_BUILD_PARTS,demos) { + module_qtlocation_demos.CONFIG += no_default_install no_default_target +} module_qtlocation_examples.subdir = examples/declarative module_qtlocation_examples.target = module-qtlocation-examples module_qtlocation_examples.depends = module_qtlocation_src +!contains(QT_BUILD_PARTS,examples) { + module_qtlocation_examples.CONFIG += no_default_install no_default_target +} module_qtlocation_tests.subdir = tests module_qtlocation_tests.target = module-qtlocation-tests module_qtlocation_tests.depends = module_qtlocation_src -module_qtlocation_tests.CONFIG = no_default_target no_default_install +!contains(QT_BUILD_PARTS,tests) { + module_qtlocation_tests.CONFIG = no_default_target no_default_install +} SUBDIRS += module_qtlocation_src \ module_qtlocation_demos \ module_qtlocation_examples \ -# module_qtlocation_tests \ + module_qtlocation_tests \ diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index e92a762f..062f2760 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -37,12 +37,6 @@ RESOURCES += resource.qrc INCLUDEPATH += $$QT.location.includes -message($$QT.location.includes) - -#INCLUDEPATH += $$SOURCE_DIR/src/location \ -# $$SOURCE_DIR/src/location/maps \ -# $$SOURCE_DIR/src/location/maps/tiled - symbian { TARGET.EPOCALLOWDLLDATA = 1 TARGET.CAPABILITY = ALL -TCB diff --git a/tests/tests.pro b/tests/tests.pro new file mode 100644 index 00000000..566e1725 --- /dev/null +++ b/tests/tests.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs + |