summaryrefslogtreecommitdiff
path: root/src/plugins/position/gypsy
diff options
context:
space:
mode:
authorvbologa <vlad.bologa@nokia.com>2012-04-12 13:43:34 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-13 05:53:00 +0200
commitc0b488cd33284e9b85bff7f580c6e50cdff57d8f (patch)
treeba84e3d0600ddec273b7b0a7ddd50cb615c8ffed /src/plugins/position/gypsy
parente3d9598cec4b9ad65cc17511159bdec532587682 (diff)
downloadqtlocation-c0b488cd33284e9b85bff7f580c6e50cdff57d8f.tar.gz
Call position source backends' init() functions after creation
This should probably be replaced long-term with a better use of the existing error() method + enum, or something similar. But for now, this keeps compatibility. Change-Id: I1b1cf5d8584c8b0c4e58dac80c2e592301843290 Reviewed-by: Alex Wilson <alex.wilson@nokia.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/plugins/position/gypsy')
-rw-r--r--src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.cpp b/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.cpp
index 6fe417ab..bb110a2e 100644
--- a/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.cpp
+++ b/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.cpp
@@ -50,5 +50,10 @@ QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryGypsy::positionInfoSource(Q
QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryGypsy::satelliteInfoSource(QObject *parent)
{
- return new QGeoSatelliteInfoSourceGypsy(parent);
+ QGeoSatelliteInfoSourceGypsy *src = new QGeoSatelliteInfoSourceGypsy(parent);
+ if (src->init() < 0) {
+ delete src;
+ src = 0;
+ }
+ return src;
}