diff options
author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-02-20 14:24:37 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-24 12:15:31 +0000 |
commit | e746e794dc27933467f6aed0c813e0cc9d0dae77 (patch) | |
tree | 528a3da8f824972e31be13a6f7d8d85a48afe469 /src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp | |
parent | c5b62ba704cc343e8d0822850a7af71bea2f5005 (diff) | |
download | qtlocation-e746e794dc27933467f6aed0c813e0cc9d0dae77.tar.gz |
WinRT: Set default timeout value properly
If no timeout is specified according, the docs state that a 'reasonable'
timeout period is used. However, that stayed 0 on WinRT so far.
Now this is set to two minutes in case GPS needs to completely start,
this value is copied from the Android implementation.
Task-number: QTBUG-44572
Change-Id: Iacd33772339744d3099422455a1fe9b3a4ceef07
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Andrew Knight <qt@panimo.net>
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp')
-rw-r--r-- | src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp index 84fa8e55..c99a05f4 100644 --- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp +++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp @@ -225,10 +225,14 @@ void QGeoPositionInfoSourceWinrt::stopHandler() void QGeoPositionInfoSourceWinrt::requestUpdate(int timeout) { - if (timeout < minimumUpdateInterval()) { + if (timeout != 0 && timeout < minimumUpdateInterval()) { emit updateTimeout(); return; } + + if (timeout == 0) + timeout = 2*60*1000; // Maximum time for cold start (see Android) + startHandler(); m_singleUpdateTimer.start(timeout); } |