diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:48:34 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:48:34 +0100 |
| commit | a8574658549af784427b61a79210349eade586c6 (patch) | |
| tree | 24eb7764be293cce6fb0b5410ea234d74959194a /src | |
| parent | c3ddde72ec3be53eeb5d41a69ceec3c407f474a2 (diff) | |
| parent | dec8f4c7680b47c1386b69829fc1ae7c38e4186f (diff) | |
| download | qtlocation-a8574658549af784427b61a79210349eade586c6.tar.gz | |
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: Ic904924227e0276e59381548fc54ee51117ddb5a
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/position/corelocation/qgeopositioninfosource_cl.mm | 25 |
1 files changed, 15 insertions, 10 deletions
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); } |