diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2012-06-25 14:50:35 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 08:18:36 +0200 |
| commit | 7d091eaa41d7dd695324c470d72cbac29196819b (patch) | |
| tree | bae3915faaa27a95ef55fa8d5be80745ac06a602 /src | |
| parent | 028f011ee216ddc8bdbac17ab7007daf253f8b95 (diff) | |
| download | qtlocation-7d091eaa41d7dd695324c470d72cbac29196819b.tar.gz | |
Compile fix for maemo position backend.
Change-Id: I9d73ec615b2799ec64d23ac0702699eec93de968
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src')
5 files changed, 17 insertions, 2 deletions
diff --git a/src/plugins/position/maemo/maemo.pro b/src/plugins/position/maemo/maemo.pro index 238a81fb..8f463980 100644 --- a/src/plugins/position/maemo/maemo.pro +++ b/src/plugins/position/maemo/maemo.pro @@ -1,7 +1,7 @@ load(qt_build_config) TARGET = qtposition_maemo -QT += location gui +QT += location gui dbus load(qt_plugin) @@ -10,7 +10,6 @@ DESTDIR = $$QT.location.plugins/position INCLUDEPATH += $$QT.location.includes -CONFIG += qdbus link_pkgconfig SOURCES += qgeopositioninfosource_maemo.cpp \ qgeosatelliteinfosource_maemo.cpp \ dbuscomm_maemo.cpp \ diff --git a/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp b/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp index ff52688e..8688cbb6 100644 --- a/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp +++ b/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp @@ -144,6 +144,10 @@ int QGeoPositionInfoSourceMaemo::minimumUpdateInterval() const return dbusComm->minimumInterval(); } +QGeoPositionInfoSource::Error QGeoPositionInfoSourceMaemo::error() const +{ + return UnknownSourceError; +} void QGeoPositionInfoSourceMaemo::startUpdates() { diff --git a/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h b/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h index ac495321..37c4aae1 100644 --- a/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h +++ b/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h @@ -85,6 +85,7 @@ public: virtual QGeoPositionInfo lastKnownPosition(bool fromSatellitePositioningMethodsOnly = false) const; virtual PositioningMethods supportedPositioningMethods() const; virtual int minimumUpdateInterval() const; + Error error() const; public Q_SLOTS: void startUpdates(); diff --git a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp index 9ff7d486..f5b9d228 100644 --- a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp +++ b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp @@ -70,6 +70,15 @@ int QGeoSatelliteInfoSourceMaemo::init() return status; } +int QGeoSatelliteInfoSourceMaemo::minimumUpdateInterval() const +{ + return 1; +} + +QGeoSatelliteInfoSource::Error QGeoSatelliteInfoSourceMaemo::error() const +{ + return UnknownSourceError; +} void QGeoSatelliteInfoSourceMaemo::startUpdates() { diff --git a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h index eac30d97..5ba8ba05 100644 --- a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h +++ b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h @@ -65,6 +65,8 @@ class QGeoSatelliteInfoSourceMaemo : public QGeoSatelliteInfoSource public: explicit QGeoSatelliteInfoSourceMaemo(QObject *parent = 0); int init(); + int minimumUpdateInterval() const; + Error error() const; public Q_SLOTS: void startUpdates(); |