diff options
| author | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
|---|---|---|
| committer | Jesse Crocker <jesse@gaiagps.com> | 2017-03-01 11:15:11 -0700 |
| commit | 9e8dc9a9e3e86adb9987ae69766cc42c7d9efece (patch) | |
| tree | f5f0abd4d342c89ad0405d01969f9d6caecc1c90 /platform/darwin/src/MGLTileSource_Private.h | |
| parent | 16fb0672e64a72b7400c321d55858b73cd5d8c3f (diff) | |
| parent | f28d75dccd9bf4a7615df87faccc5cf5eff8df89 (diff) | |
| download | qtlocation-mapboxgl-9e8dc9a9e3e86adb9987ae69766cc42c7d9efece.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/custom-vector-source
Diffstat (limited to 'platform/darwin/src/MGLTileSource_Private.h')
| -rw-r--r-- | platform/darwin/src/MGLTileSource_Private.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLTileSource_Private.h b/platform/darwin/src/MGLTileSource_Private.h index 8da69274f2..0d9876d412 100644 --- a/platform/darwin/src/MGLTileSource_Private.h +++ b/platform/darwin/src/MGLTileSource_Private.h @@ -15,7 +15,7 @@ namespace mbgl { /** An HTML string to be displayed as attribution when the map is shown to a user. - + The default value is `nil`. If the source is initialized with a configuration URL, this property is also `nil` until the configuration JSON file is loaded. */ @@ -24,7 +24,7 @@ namespace mbgl { /** A structured representation of the `attribution` property. The default value is `nil`. - + @param fontSize The default text size in points, or 0 to use the default. @param linkColor The default link color, or `nil` to use the default. */ |