Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: Ia0a66c229f249532e70b1548f5e618e4db4bc5ad

2 files changed, 19 insertions, 3 deletions

diff --git a/src/location/labs/qdeclarativenavigator.cpp b/src/location/labs/qdeclarativenavigator.cpp
index 5dfdfdbe..eccfd082 100644
--- a/src/location/labs/qdeclarativenavigator.cpp
+++ b/src/location/labs/qdeclarativenavigator.cpp
@@ -44,6 +44,24 @@
 QT_BEGIN_NAMESPACE
 
 /*!
+    \qmlmodule Qt.labs.location 1.0
+    \title Qt Labs Location QML Types
+    \ingroup qmlmodules
+    \brief Provides experimental QtLocation QML types, such as \l Navigator and
+    various map objects types (not to be confused with map items).
+
+    To use this module, import the module with the following line:
+
+    \code
+    import Qt.labs.location 1.0
+    \endcode
+
+    \note These types are experimental and subject to source-incompatible changes from one
+    Qt minor release to the next, until they are ready to be moved to the stable QtLocation QML
+    module.
+*/
+
+/*!
     \qmltype Navigator
     \instantiates QDeclarativeNavigator
     \inqmlmodule Qt.labs.location
diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
index c3b9efaa..7df49307 100644
--- a/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
+++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp
@@ -226,11 +226,10 @@ void QGeoPositionInfoSourceWinRT::setPreferredPositioningMethods(QGeoPositionInf
     PositioningMethods previousPreferredPositioningMethods = preferredPositioningMethods();
     QGeoPositionInfoSource::setPreferredPositioningMethods(methods);
     if (previousPreferredPositioningMethods == preferredPositioningMethods()
-            || d->initState != InitializationState::Uninitialized) {
+            || d->initState == InitializationState::Uninitialized) {
         return;
     }
 
-    Q_ASSERT(d->initState != InitializationState::Initializing);
     const bool needsRestart = d->positionToken.value != 0 || d->statusToken.value != 0;
 
     if (needsRestart)
@@ -257,7 +256,6 @@ void QGeoPositionInfoSourceWinRT::setUpdateInterval(int msec)
         return;
     }
 
-    Q_ASSERT(d->initState != InitializationState::Initializing);
     // minimumUpdateInterval is initialized to the lowest possible update interval in init().
     // Passing 0 will cause an error on Windows 10.
     // See https://docs.microsoft.com/en-us/uwp/api/windows.devices.geolocation.geolocator.reportinterval