diff options
author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2019-04-10 13:01:59 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-10 13:01:59 -0700 |
commit | 2f0af0e8f4e1f0fc0dbc4a6b13ab2f098adad0af (patch) | |
tree | 69c01c248136ba2c9a80cc8900e2a697acffb3d7 /platform/macos | |
parent | 7bfb9c9658f00b5745fb8aea44b1224278b3190e (diff) | |
download | qtlocation-mapboxgl-2f0af0e8f4e1f0fc0dbc4a6b13ab2f098adad0af.tar.gz |
[ios] Deactivate MGLMapView IBDesignable (#14379)
Removed MGLMapView's IBDesignable attribute. The map's view render attributes
uses GL, making changes through the inspectables were not reflected in the storyboard
and were causing IB crashes.
* [ios] Deactivate MGLMapView IBDesignable.
* [ios] Remove IBDesignable agent code.
* [ios, macos] Remove NSProcessInfo category from iOS.
Diffstat (limited to 'platform/macos')
-rw-r--r-- | platform/macos/macos.xcodeproj/project.pbxproj | 4 | ||||
-rw-r--r-- | platform/macos/sdk-files.json | 4 | ||||
-rw-r--r-- | platform/macos/src/NSProcessInfo+MGLAdditions.h | 11 | ||||
-rw-r--r-- | platform/macos/src/NSProcessInfo+MGLAdditions.m | 10 |
4 files changed, 25 insertions, 4 deletions
diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj index dfde6d01e2..91ed2f4cfa 100644 --- a/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/macos/macos.xcodeproj/project.pbxproj @@ -1022,6 +1022,8 @@ 355BA4EC1D41633E00CCC6D5 /* NSColor+MGLAdditions.mm */, 405C03961DB0004E001AC280 /* NSImage+MGLAdditions.h */, 405C03971DB0004E001AC280 /* NSImage+MGLAdditions.mm */, + DAE6C3801CC31E2A00DB3429 /* NSProcessInfo+MGLAdditions.h */, + DAE6C3811CC31E2A00DB3429 /* NSProcessInfo+MGLAdditions.m */, ); name = Categories; sourceTree = "<group>"; @@ -1121,8 +1123,6 @@ 352903991D6C63B80002C7DF /* NSPredicate+MGLAdditions.h */, 3529039A1D6C63B80002C7DF /* NSPredicate+MGLAdditions.mm */, 1FC481842098F323000D09B4 /* NSPredicate+MGLPrivateAdditions.h */, - DAE6C3801CC31E2A00DB3429 /* NSProcessInfo+MGLAdditions.h */, - DAE6C3811CC31E2A00DB3429 /* NSProcessInfo+MGLAdditions.m */, DAE6C3821CC31E2A00DB3429 /* NSString+MGLAdditions.h */, DAE6C3831CC31E2A00DB3429 /* NSString+MGLAdditions.m */, DAED385D1D62CED700D7640F /* NSURL+MGLAdditions.h */, diff --git a/platform/macos/sdk-files.json b/platform/macos/sdk-files.json index cc6b4a4d79..4448de1f5b 100644 --- a/platform/macos/sdk-files.json +++ b/platform/macos/sdk-files.json @@ -52,7 +52,7 @@ "platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm", "platform/darwin/src/MGLPolygon.mm", "platform/darwin/src/MGLDistanceFormatter.m", - "platform/darwin/src/NSProcessInfo+MGLAdditions.m", + "platform/macos/src/NSProcessInfo+MGLAdditions.m", "platform/darwin/src/MGLFillExtrusionStyleLayer.mm", "platform/darwin/src/MGLOfflineStorage.mm", "platform/darwin/src/NSURL+MGLAdditions.m", @@ -177,7 +177,7 @@ "MGLNetworkConfiguration_Private.h": "platform/darwin/src/MGLNetworkConfiguration_Private.h", "NSCompoundPredicate+MGLAdditions.h": "platform/darwin/src/NSCompoundPredicate+MGLAdditions.h", "MGLSymbolStyleLayer_Private.h": "platform/darwin/src/MGLSymbolStyleLayer_Private.h", - "NSProcessInfo+MGLAdditions.h": "platform/darwin/src/NSProcessInfo+MGLAdditions.h", + "NSProcessInfo+MGLAdditions.h": "platform/macos/src/NSProcessInfo+MGLAdditions.h", "MGLRendererFrontend.h": "platform/darwin/src/MGLRendererFrontend.h", "NSValue+MGLStyleAttributeAdditions.h": "platform/darwin/src/NSValue+MGLStyleAttributeAdditions.h", "NSImage+MGLAdditions.h": "platform/macos/src/NSImage+MGLAdditions.h", diff --git a/platform/macos/src/NSProcessInfo+MGLAdditions.h b/platform/macos/src/NSProcessInfo+MGLAdditions.h new file mode 100644 index 0000000000..1dc1439d53 --- /dev/null +++ b/platform/macos/src/NSProcessInfo+MGLAdditions.h @@ -0,0 +1,11 @@ +#import <Foundation/Foundation.h> + +@interface NSProcessInfo (MGLAdditions) + +/** + Returns YES if the current process is Interface Builder’s helper process for + rendering designables. + */ +- (BOOL)mgl_isInterfaceBuilderDesignablesAgent; + +@end diff --git a/platform/macos/src/NSProcessInfo+MGLAdditions.m b/platform/macos/src/NSProcessInfo+MGLAdditions.m new file mode 100644 index 0000000000..0c287c030b --- /dev/null +++ b/platform/macos/src/NSProcessInfo+MGLAdditions.m @@ -0,0 +1,10 @@ +#import "NSProcessInfo+MGLAdditions.h" + +@implementation NSProcessInfo (MGLAdditions) + +- (BOOL)mgl_isInterfaceBuilderDesignablesAgent { + NSString *processName = self.processName; + return [processName hasPrefix:@"IBAgent"] || [processName hasPrefix:@"IBDesignablesAgent"]; +} + +@end |