diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2015-11-30 11:10:27 -0800 |
|---|---|---|
| committer | Justin R. Miller <incanus@codesorcery.net> | 2015-11-30 11:10:27 -0800 |
| commit | 8d25d9ab1a71bb79c1e9612174a87481a45cb6c7 (patch) | |
| tree | 457ffe54fbca6c3523aee3abdab927290d69417c /include | |
| parent | 77df026adcabb04ddbaa90c3782fc7f11bc46ec7 (diff) | |
| parent | 6d4e86f41db54fa2830f726b990236790ea1c525 (diff) | |
| download | qtlocation-mapboxgl-8d25d9ab1a71bb79c1e9612174a87481a45cb6c7.tar.gz | |
Merge branch 'release-ios-v3.0.0'
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/ios/MGLMapView+IBAdditions.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/mbgl/ios/MGLMapView+IBAdditions.h b/include/mbgl/ios/MGLMapView+IBAdditions.h index 52d5d433b6..f18df56e01 100644 --- a/include/mbgl/ios/MGLMapView+IBAdditions.h +++ b/include/mbgl/ios/MGLMapView+IBAdditions.h @@ -14,12 +14,16 @@ NS_ASSUME_NONNULL_BEGIN // inspectables declared in MGLMapView.h are always sorted before those in // MGLMapView+IBAdditions.h, due to ASCII sort order. +#if TARGET_INTERFACE_BUILDER + // HACK: We want this property to look like a URL bar in the Attributes // inspector, but just calling it styleURL would violate Cocoa naming // conventions and conflict with the existing NSURL property. Fortunately, IB // strips out the two underscores for display. @property (nonatomic, nullable) IBInspectable NSString *styleURL__; +#endif // TARGET_INTERFACE_BUILDER + // Convenience properties related to the initial viewport. These properties // are not meant to be used outside of Interface Builder. latitude and longitude // are backed by properties of type CLLocationDegrees, but these declarations |