Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I247820c085a1e5fa95e412b20ad0ecd9a857f19e

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);
 }