summaryrefslogtreecommitdiff
path: root/src/plugins/position/winrt
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-03-17 09:48:47 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-03-17 09:48:47 +0100
commitf861ced96813fcb1b09f76c76e2c3dc91a2c52d3 (patch)
treed9551b44328f4b6aff36a5aaaf2cf28fcff7ed4a /src/plugins/position/winrt
parent6cf940dad33b0e60286a839023bb0530791b8095 (diff)
parent5421a141819e4954970aa9c16201a10ed09c8503 (diff)
downloadqtlocation-f861ced96813fcb1b09f76c76e2c3dc91a2c52d3.tar.gz
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: Ia4c1dbe6ca0c852bee6f0e5bc96fec6f7cde87e0
Diffstat (limited to 'src/plugins/position/winrt')
-rw-r--r--src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
index d1f29699..51799949 100644
--- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
+++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
@@ -145,6 +145,11 @@ void QGeoPositionInfoSourceWinrt::setPreferredPositioningMethods(QGeoPositionInf
void QGeoPositionInfoSourceWinrt::setUpdateInterval(int msec)
{
+ // Windows Phone does not support 0 interval
+#ifdef Q_OS_WINPHONE
+ if (msec == 0)
+ msec = minimumUpdateInterval();
+#endif
// If msec is 0 we send updates as data becomes available, otherwise we force msec to be equal
// to or larger than the minimum update interval.
if (msec != 0 && msec < minimumUpdateInterval())