diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2015-06-19 15:56:53 -0700 |
|---|---|---|
| committer | Justin R. Miller <incanus@codesorcery.net> | 2015-06-19 15:56:53 -0700 |
| commit | 0955dfc19f30aedcc95e7e3c03c73d3dcc149c44 (patch) | |
| tree | db0bc4095d2381d1a1bf3ae5a07bd8c30d455714 /include | |
| parent | 898f4d3f084fc9553b92956da04019af90a4f872 (diff) | |
| parent | cfa0890d821b1d60b32f957931ffde2abc25c664 (diff) | |
| download | qtlocation-mapboxgl-0955dfc19f30aedcc95e7e3c03c73d3dcc149c44.tar.gz | |
Merge branch 'release-v0.4.0'
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/ios/MGLAccountManager.h | 2 | ||||
| -rw-r--r-- | include/mbgl/ios/MGLMapView.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/mbgl/ios/MGLAccountManager.h b/include/mbgl/ios/MGLAccountManager.h index 2efabf8941..9bfb3b497e 100644 --- a/include/mbgl/ios/MGLAccountManager.h +++ b/include/mbgl/ios/MGLAccountManager.h @@ -21,8 +21,6 @@ NS_ASSUME_NONNULL_BEGIN /** @name Providing User Metrics Opt-Out */ -/** Certain Mapbox plans require the collection of user metrics. If you aren't using a preference switch in an existing or new `Settings.bundle` in your application, set this value to `YES` to indicate that you are providing a metrics opt-out for users within your app's interface directly. -* @param showsOptOut Whether your application's interface provides a user opt-out preference. The default value is `NO`, meaning a `Settings.bundle` is expected for providing a user opt-out preference. */ + (void)setMapboxMetricsEnabledSettingShownInApp:(BOOL)showsOptOut __attribute__((unavailable("Set MGLMapboxMetricsEnabledSettingShownInApp in Info.plist."))); /** Whether in-app user metrics opt-out is configured. If set to the default value of `NO`, a user opt-out preference is expected in a `Settings.bundle` that shows in the application's section within the system Settings app. */ diff --git a/include/mbgl/ios/MGLMapView.h b/include/mbgl/ios/MGLMapView.h index abe7f851a1..bf258ee82e 100644 --- a/include/mbgl/ios/MGLMapView.h +++ b/include/mbgl/ios/MGLMapView.h @@ -42,7 +42,6 @@ IB_DESIGNABLE /** @name Authorizing Access */ -/** Mapbox API access token for the map view. */ @property (nonatomic, nullable) NSString *accessToken __attribute__((unavailable("Use +[MGLAccountManager accessToken] and +[MGLAccountManager setAccessToken:]."))); #pragma mark - Managing Constraints |