diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:16:30 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:16:30 +0100 |
commit | 136e1eaac61763cd1d0f7f6a5b92f14dd3bef69c (patch) | |
tree | 4d939d57a6a5b8d4e804f4782084a99e51190917 | |
parent | 8e5a06a5548ec50be419df60650a32e136010816 (diff) | |
parent | e746e794dc27933467f6aed0c813e0cc9d0dae77 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I247820c085a1e5fa95e412b20ad0ecd9a857f19e
-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 89b1612a..d1f29699 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); } |