diff options
Diffstat (limited to 'src')
4 files changed, 13 insertions, 6 deletions
diff --git a/src/plugins/position/geoclue/geoclue.pro b/src/plugins/position/geoclue/geoclue.pro index ea0522ab..fcbf600c 100644 --- a/src/plugins/position/geoclue/geoclue.pro +++ b/src/plugins/position/geoclue/geoclue.pro @@ -6,21 +6,19 @@ QT += location gui load(qt_plugin) DESTDIR = $$QT.location.plugins/position -#QTDIR_build:REQUIRES += "contains(QT_CONFIG, location)" HEADERS += \ qgeopositioninfosource_geocluemaster_p.h \ qgeopositioninfosourcefactory_geoclue.h SOURCES += \ - qgeopositioninfosource_geocluemaster_p.h \ + qgeopositioninfosource_geocluemaster.cpp \ qgeopositioninfosourcefactory_geoclue.cpp INCLUDEPATH += $$QT.location.includes -CONFIG += qdbus link_pkgconfig -DEFINES += GEOCLUE_MASTER_AVAILABLE=1 -PKGCONFIG += geoclue +CONFIG += link_pkgconfig +PKGCONFIG += geoclue gconf-2.0 target.path += $$[QT_INSTALL_PLUGINS]/position INSTALLS += target diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp index d9a7f2dc..90577854 100644 --- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp +++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp @@ -552,5 +552,12 @@ QGeoPositionInfo QGeoPositionInfoSourceGeoclueMaster::geoclueToPositionInfo( return info; } + +QGeoPositionInfoSource::Error QGeoPositionInfoSourceGeoclueMaster::error() const +{ + return UnknownSourceError; +} + #include "moc_qgeopositioninfosource_geocluemaster_p.cpp" + QT_END_NAMESPACE diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h index cd4db044..d75cb6d1 100644 --- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h +++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h @@ -101,6 +101,8 @@ public: void velocityUpdateFailed(); void velocityUpdateSucceeded(double speed); + Error error() const; + public slots: virtual void startUpdates(); virtual void stopUpdates(); diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro index 0b80ef24..c221e135 100644 --- a/src/plugins/position/position.pro +++ b/src/plugins/position/position.pro @@ -2,8 +2,8 @@ TEMPLATE = subdirs maemo6|meego:SUBDIRS += maemo meego { - contains (geoclue-master_enabled, yes):SUBDIRS += geoclue contains (gypsy_enabled, yes):SUBDIRS += gypsy } +config_geoclue:SUBDIRS += geoclue config_locationd:!simulator:SUBDIRS += npe_backend simulator:SUBDIRS += simulator |