summaryrefslogtreecommitdiff
path: root/platform/darwin
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-07-14 16:31:08 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-07-14 16:31:08 -0700
commit244700e56033179726a164b1a0801dbd4c382770 (patch)
tree126348f1e3693e366d822606756bbafea4d0877d /platform/darwin
parent95e5d122355858c5c56f034e367e7e5255349799 (diff)
parentae06be21941c67dffdb0d59216190840667748cf (diff)
downloadqtlocation-mapboxgl-244700e56033179726a164b1a0801dbd4c382770.tar.gz
Merge branch 'release-ios-v3.3.0'
Diffstat (limited to 'platform/darwin')
-rw-r--r--platform/darwin/src/MGLAccountManager.h2
-rw-r--r--platform/darwin/src/MGLTypes.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLAccountManager.h b/platform/darwin/src/MGLAccountManager.h
index 63440046f7..2a11b2869e 100644
--- a/platform/darwin/src/MGLAccountManager.h
+++ b/platform/darwin/src/MGLAccountManager.h
@@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
The MGLAccountManager object provides a global way to set a Mapbox API access
- token, as well as other settings used framework-wide.
+ token.
*/
@interface MGLAccountManager : NSObject
diff --git a/platform/darwin/src/MGLTypes.h b/platform/darwin/src/MGLTypes.h
index 746cb686c0..2579451f2d 100644
--- a/platform/darwin/src/MGLTypes.h
+++ b/platform/darwin/src/MGLTypes.h
@@ -29,7 +29,10 @@ typedef NS_ENUM(NSInteger, MGLErrorCode) {
MGLErrorCodeConnectionFailed = 3,
};
-/** The mode used to track the user location on the map. */
+/**
+ The mode used to track the user location on the map. Used with
+ `MGLMapView.userTrackingMode`.
+ */
typedef NS_ENUM(NSUInteger, MGLUserTrackingMode) {
/** The map does not follow the user location. */
MGLUserTrackingModeNone = 0,