diff options
author | Justin R. Miller <incanus@codesorcery.net> | 2016-10-18 14:33:25 -0700 |
---|---|---|
committer | Justin R. Miller <incanus@codesorcery.net> | 2016-10-18 14:33:25 -0700 |
commit | cc75209ce4553212f3442692b1123e4c6fd85ff2 (patch) | |
tree | e99dc62c90be3458b61766e9db529ddc627cecc5 /platform/macos/src/Mapbox.h | |
parent | b0c6eb309e76cf06a8fdef1316abbe07bb0f2f74 (diff) | |
parent | 0ccc7f51ba1d3377b93b4dddc3a4a03d0fda2260 (diff) | |
download | qtlocation-mapboxgl-cc75209ce4553212f3442692b1123e4c6fd85ff2.tar.gz |
Merge remote-tracking branch 'origin/master' into smooth-camera
Diffstat (limited to 'platform/macos/src/Mapbox.h')
-rw-r--r-- | platform/macos/src/Mapbox.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/platform/macos/src/Mapbox.h b/platform/macos/src/Mapbox.h index 0217bca44a..67e3775100 100644 --- a/platform/macos/src/Mapbox.h +++ b/platform/macos/src/Mapbox.h @@ -30,7 +30,8 @@ FOUNDATION_EXPORT const unsigned char MapboxVersionString[]; #import "MGLShapeCollection.h" #import "MGLStyle.h" #import "MGLStyleLayer.h" -#import "MGLBaseStyleLayer.h" +#import "MGLForegroundStyleLayer.h" +#import "MGLVectorStyleLayer.h" #import "MGLFillStyleLayer.h" #import "MGLLineStyleLayer.h" #import "MGLSymbolStyleLayer.h" @@ -44,10 +45,4 @@ FOUNDATION_EXPORT const unsigned char MapboxVersionString[]; #import "MGLTilePyramidOfflineRegion.h" #import "MGLTypes.h" #import "NSValue+MGLAdditions.h" -#import "MGLStyleAttributeValue.h" -#import "MGLStyleAttributeFunction.h" -#import "NSColor+MGLStyleAttributeAdditions.h" -#import "NSNumber+MGLStyleAttributeAdditions.h" -#import "NSValue+MGLStyleAttributeAdditions.h" -#import "NSString+MGLStyleAttributeAdditions.h" -#import "NSArray+MGLStyleAttributeAdditions.h" +#import "MGLStyleValue.h" |