summaryrefslogtreecommitdiff
path: root/gyp
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-01-06 15:13:39 -0800
committerMinh Nguyễn <mxn@1ec5.org>2016-01-06 23:43:07 -0800
commit11d99bd890ef2cbadc16beb7289dd818fa86c9df (patch)
tree6b7650c5675fdd0c3b0719e4262ffc4213b83843 /gyp
parentb70fd7ae6947e9d0c2f4b2a2d23069cedac5fa4a (diff)
downloadqtlocation-mapboxgl-11d99bd890ef2cbadc16beb7289dd818fa86c9df.tar.gz
[ios] Refined custom callout view support
Renamed MGLCalloutView to MGLCompactCalloutView and MGLCalloutViewProtocol to MGLCalloutView to avoid an awkward workaround for a Swift name collision. Replaced individual title and subtitle properties with a single representedObject property that lets you use custom annotation properties in the custom callout view. Overrode a problematic SMCalloutView method. Added lots more documentation.
Diffstat (limited to 'gyp')
-rw-r--r--gyp/platform-ios.gypi6
1 files changed, 3 insertions, 3 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index e3e2758128..1a36cf046d 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -68,9 +68,9 @@
'../include/mbgl/ios/MGLAnnotationImage.h',
'../platform/ios/src/MGLAnnotationImage_Private.h',
'../platform/ios/src/MGLAnnotationImage.m',
- '../include/mbgl/ios/MGLCalloutViewProtocol.h',
- '../platform/ios/src/MGLCalloutView.h',
- '../platform/ios/src/MGLCalloutView.m',
+ '../include/mbgl/ios/MGLCalloutView.h',
+ '../platform/ios/src/MGLCompactCalloutView.h',
+ '../platform/ios/src/MGLCompactCalloutView.m',
'../platform/ios/src/MGLCategoryLoader.h',
'../platform/ios/src/MGLCategoryLoader.m',
'../platform/ios/src/NSBundle+MGLAdditions.h',