diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2012-06-25 14:40:54 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 09:20:37 +0200 |
| commit | 932c4306a66b31d9cb7e5ae16d5f022f29b5c855 (patch) | |
| tree | 526ed8c4563fa5537310907645df06021f254d9e /src/plugins/position/gypsy | |
| parent | 5de58c395a110b99796570bfa81627a8d6f2c521 (diff) | |
| download | qtlocation-932c4306a66b31d9cb7e5ae16d5f022f29b5c855.tar.gz | |
Add config test to detect when to build gypsy backend.
Previously the gypsy backend was only being built when CONFIG+=meego
was set.
Change-Id: Ia738ea270252206974f5fcdf146a53ba221925f0
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/plugins/position/gypsy')
| -rw-r--r-- | src/plugins/position/gypsy/gypsy.pro | 6 | ||||
| -rw-r--r-- | src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h | 3 |
3 files changed, 17 insertions, 6 deletions
diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro index 16141bb9..14eb1030 100644 --- a/src/plugins/position/gypsy/gypsy.pro +++ b/src/plugins/position/gypsy/gypsy.pro @@ -6,7 +6,6 @@ QT += location gui load(qt_plugin) DESTDIR = $$QT.location.plugins/position -#QTDIR_build:REQUIRES += "contains(QT_CONFIG, location)" HEADERS += \ qgeosatelliteinfosource_gypsy_p.h \ @@ -18,9 +17,8 @@ SOURCES += \ INCLUDEPATH += $$QT.location.includes -CONFIG += qdbus link_pkgconfig -DEFINES += GYPSY_AVAILABLE=1 -PKGCONFIG += gypsy +CONFIG += link_pkgconfig +PKGCONFIG += gypsy gconf-2.0 target.path += $$[QT_INSTALL_PLUGINS]/position INSTALLS += target diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp index 5f229cbb..c8ef51f7 100644 --- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp +++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp @@ -178,8 +178,8 @@ void QGeoSatelliteInfoSourceGypsy::satellitesChanged(GypsySatellite *satellite, // If a single updateRequest was active, send signals right away. // If a periodic timer was running (meaning that the client wishes // to have updates at defined intervals), store the data for later sending. - QList<QtMobility::QGeoSatelliteInfo> lastSatellitesInView; - QList<QtMobility::QGeoSatelliteInfo> lastSatellitesInUse; + QList<QGeoSatelliteInfo> lastSatellitesInView; + QList<QGeoSatelliteInfo> lastSatellitesInUse; unsigned int i; for (i = 0; i < satellites->len; i++) { @@ -283,6 +283,16 @@ int QGeoSatelliteInfoSourceGypsy::init() return 0; } +int QGeoSatelliteInfoSourceGypsy::minimumUpdateInterval() const +{ + return 1; +} + +QGeoSatelliteInfoSource::Error QGeoSatelliteInfoSourceGypsy::error() const +{ + return UnknownSourceError; +} + void QGeoSatelliteInfoSourceGypsy::startUpdates() { if (m_updatesOngoing) diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h index a6079a8e..ba456e69 100644 --- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h +++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h @@ -107,6 +107,9 @@ public: ~QGeoSatelliteInfoSourceGypsy(); int init(); + int minimumUpdateInterval() const; + Error error() const; + public slots: virtual void startUpdates(); void stopUpdates(); |