Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Id26038e277831da9f3b61f54be3c1d3c18c162a7

2 files changed, 62 insertions, 10 deletions

diff --git a/dist/changes-5.14.0 b/dist/changes-5.14.0
new file mode 100644
index 00000000..a2748e55
--- /dev/null
+++ b/dist/changes-5.14.0
@@ -0,0 +1,47 @@
+Qt 5.14 introduces many new features and improvements as well as bugfixes
+over the 5.13.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.14 series is binary compatible with the 5.13.x series.
+Applications compiled for 5.13 will continue to run with 5.14.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                QtLocation                                *
+****************************************************************************
+
+ - [QTBUG-76867] Added property to disable the automatic fade-in/fade-out
+   behavior of MapItems on low zoom levels.
+ - Added QDeclarativeGeoServiceProviderRequirements
+   navigation property.
+ - Added notification signal to Map.visibleRegion property.
+ - Added automaticReroutingEnabled, isOnRoute and alternativeRoutes
+   properties to QDeclarativeNavigator.
+ - Added a recalculateRoutes invokable method to QDeclarativeNavigator.
+
+ - Geoservice Plugins
+   * MapboxGL: Added support for image sources.
+
+****************************************************************************
+*                              QtPositioning                               *
+****************************************************************************
+
+ - [QTBUG-66304] Exposed PluginParameter also from QtPositioning qml
+   plugin, to be used in PositionSource as replacement of environment
+   variables.
+ - [QTBUG-59274] Added Satellite info source capabilities to the serial nmea
+   plugin.
+
+
+
+
+
diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
index fae16715..2d412138 100644
--- a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
+++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm
@@ -61,6 +61,12 @@
     }
     return self;
 }
+- (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status
+{
+    Q_UNUSED(manager)
+    if (status == kCLAuthorizationStatusNotDetermined)
+        m_positionInfoSource->requestUpdate(MINIMUM_UPDATE_INTERVAL);
+}
 
 - (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation
 {
@@ -198,22 +204,21 @@ bool QGeoPositionInfoSourceCL::enableLocationManager()
         // while probably a noop, the call generates a warning).
         // -requestWhenInUseAuthorization only requires NSLocationWhenInUseUsageDescription
         // entry in Info.plist (available on iOS (>= 8.0), tvOS (>= 9.0) and watchOS (>= 2.0).
+    }
 
 #ifndef Q_OS_MACOS
-        NSDictionary<NSString *, id> *infoDict = NSBundle.mainBundle.infoDictionary;
-        const bool hasAlwaysUseUsage = !![infoDict objectForKey:@"NSLocationAlwaysAndWhenInUseUsageDescription"];
-        const bool hasWhenInUseUsage = !![infoDict objectForKey:@"NSLocationWhenInUseUsageDescription"];
+    NSDictionary<NSString *, id> *infoDict = NSBundle.mainBundle.infoDictionary;
+    const bool hasAlwaysUseUsage = !![infoDict objectForKey:@"NSLocationAlwaysAndWhenInUseUsageDescription"];
+    const bool hasWhenInUseUsage = !![infoDict objectForKey:@"NSLocationWhenInUseUsageDescription"];
 #ifndef Q_OS_TVOS
-        if (hasAlwaysUseUsage && hasWhenInUseUsage)
-            [m_locationManager requestAlwaysAuthorization];
-        else
+    if (hasAlwaysUseUsage && hasWhenInUseUsage)
+        [m_locationManager requestAlwaysAuthorization];
+    else
 #endif // !Q_OS_TVOS
-        if (hasWhenInUseUsage)
-            [m_locationManager requestWhenInUseAuthorization];
+    if (hasWhenInUseUsage)
+        [m_locationManager requestWhenInUseAuthorization];
 #endif // !Q_OS_MACOS
 
-    }
-
     return (m_locationManager != nullptr);
 }