summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-03-17 12:08:16 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-03-17 13:22:13 +0000
commit767e2b00441dc3b87df6c63a26f27d2b2fefecbf (patch)
tree3889c3d41e1cda86ee0d5e58c387cfa3c15f7cb2 /src/plugins
parent588a68a3f135888671546cfcd94dc20af0cb9f4f (diff)
parentf861ced96813fcb1b09f76c76e2c3dc91a2c52d3 (diff)
downloadqtlocation-767e2b00441dc3b87df6c63a26f27d2b2fefecbf.tar.gz
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/plugins')
-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())