diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-18 03:01:24 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-18 03:01:24 +0200 |
| commit | 0a9ef37972aed19ec4451d0a0e24bfacc56bded3 (patch) | |
| tree | 42059ae7c75f741a8b9ac08334e48da05cf2eb5d | |
| parent | f0472774b36c862f5fb6822f2d4d63a967d1eaec (diff) | |
| parent | 571126c3d63f899a67b896886aaec8cf4f0acb1c (diff) | |
| download | qtlocation-0a9ef37972aed19ec4451d0a0e24bfacc56bded3.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I001477f8534dd8eb565a365143c5799834df56ff
| -rw-r--r-- | src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp index 1f8294fd..b7524d84 100644 --- a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp +++ b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp @@ -96,7 +96,7 @@ void QGeoSatelliteInfoSourceGeoclueMaster::startUpdates() if (!m_master->hasMasterClient()) configureSatelliteSource(); - m_requestTimer.start(updateInterval()); + m_requestTimer.start(qMax(updateInterval(), minimumUpdateInterval())); } void QGeoSatelliteInfoSourceGeoclueMaster::stopUpdates() @@ -173,7 +173,7 @@ void QGeoSatelliteInfoSourceGeoclueMaster::updateSatelliteInfo(int timestamp, in m_inUse = inUse; emit satellitesInUseUpdated(m_inUse); - m_requestTimer.start(updateInterval()); + m_requestTimer.start(qMax(updateInterval(), minimumUpdateInterval())); } void QGeoSatelliteInfoSourceGeoclueMaster::requestUpdateTimeout() |