diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-26 10:02:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-26 10:18:14 +0100 |
| commit | 518633da419d6cfaf603773b9e8c5840e783bc4a (patch) | |
| tree | 326ffd3f5497be64e38fa420af016867ada00538 /src/imports/positioning/qdeclarativepositionsource.cpp | |
| parent | 9283a290040fd55f7eb34580b99f771d4facdeb4 (diff) | |
| parent | 68b5ee9e7064f66fd7e7bd69b4b51229dbe8cc3c (diff) | |
| download | qtlocation-518633da419d6cfaf603773b9e8c5840e783bc4a.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
tests/plugins/declarativetestplugin/testhelper.h
Change-Id: Ie218ab1dc68642a6922e05e5688c20b90440b72e
Diffstat (limited to 'src/imports/positioning/qdeclarativepositionsource.cpp')
| -rw-r--r-- | src/imports/positioning/qdeclarativepositionsource.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp index 05232d51..73d99fe5 100644 --- a/src/imports/positioning/qdeclarativepositionsource.cpp +++ b/src/imports/positioning/qdeclarativepositionsource.cpp @@ -297,6 +297,7 @@ void QDeclarativePositionSource::setNmeaSource(const QUrl &nmeaSource) qDebug() << "QDeclarativePositionSource NMEA File was found: " << localFileName; #endif m_positionSource = new QNmeaPositionInfoSource(QNmeaPositionInfoSource::SimulationMode); + (qobject_cast<QNmeaPositionInfoSource *>(m_positionSource))->setUserEquivalentRangeError(2.5); // it is internally multiplied by 2 in qlocationutils_readGga (qobject_cast<QNmeaPositionInfoSource *>(m_positionSource))->setDevice(m_nmeaFile); connect(m_positionSource, SIGNAL(positionUpdated(QGeoPositionInfo)), this, SLOT(positionUpdateReceived(QGeoPositionInfo))); |