diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2015-11-24 11:49:12 -0800 |
|---|---|---|
| committer | Justin R. Miller <incanus@codesorcery.net> | 2015-12-03 15:43:53 -0800 |
| commit | 6b4e8bac6dddf77268c1d87039b434fbfd4525c7 (patch) | |
| tree | e5fe89880e80832b6ca82ab655aabfb8bb95cf92 | |
| parent | 0514082eb26096b0896e2555446b61c6f3d38fa6 (diff) | |
| download | qtlocation-mapboxgl-6b4e8bac6dddf77268c1d87039b434fbfd4525c7.tar.gz | |
fixes #3113: bring in MGLMapView via +load for Interface Builder
| -rw-r--r-- | platform/ios/MGLAccountManager.m | 5 | ||||
| -rw-r--r-- | platform/ios/MGLCategoryLoader.m | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/platform/ios/MGLAccountManager.m b/platform/ios/MGLAccountManager.m index aad8423ce0..eb1b9480d8 100644 --- a/platform/ios/MGLAccountManager.m +++ b/platform/ios/MGLAccountManager.m @@ -18,6 +18,9 @@ #pragma mark - Internal + (void)load { + // Load all referenced categories due to absence of -ObjC linker flag + [MGLCategoryLoader loadCategories]; + // Read the initial configuration from Info.plist. The shown-in-app setting // preempts the Settings bundle check in -[MGLMapboxEvents init] triggered // by setting the access token. @@ -35,8 +38,6 @@ // Can be called from any thread. // + (instancetype) sharedManager { - [MGLCategoryLoader loadCategories]; - if (NSProcessInfo.processInfo.mgl_isInterfaceBuilderDesignablesAgent) { return nil; } diff --git a/platform/ios/MGLCategoryLoader.m b/platform/ios/MGLCategoryLoader.m index 13d82b19b2..50309436b7 100644 --- a/platform/ios/MGLCategoryLoader.m +++ b/platform/ios/MGLCategoryLoader.m @@ -4,15 +4,21 @@ #import "NSProcessInfo+MGLAdditions.h" #import "NSString+MGLAdditions.h" -// https://github.com/mapbox/mapbox-gl-native/issues/2966 +#import "MGLMapView.h" @implementation MGLCategoryLoader + (void)loadCategories { + // https://github.com/mapbox/mapbox-gl-native/issues/2966 + // mgl_linkBundleCategory(); mgl_linkProcessCategory(); mgl_linkStringCategory(); + + // https://github.com/mapbox/mapbox-gl-native/issues/3113 + // + NSString *description = [MGLMapView description]; } @end |