diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2018-09-13 00:26:09 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2018-09-13 01:16:30 -0700 |
| commit | 2d99be2f26ff9441d6bf712883d8e0c81da244b2 (patch) | |
| tree | b0691c82eb43d7f722fd695c0adc41ea86ae5dd5 | |
| parent | 6367fcb2a82c52c7f80e82941621be603373a57b (diff) | |
| download | qtlocation-mapboxgl-upstream/1ec5-designable-xcode-10-gm.tar.gz | |
[ios, macos] Look even more widely for IB designables agentupstream/1ec5-designable-xcode-10-gm
The IBDesignablesAgent helper process has been renamed to IBAgent as of the Xcode 10 GM seed, so cast an even wider net when trying to detect it.
| -rw-r--r-- | platform/darwin/src/NSProcessInfo+MGLAdditions.m | 3 | ||||
| -rw-r--r-- | platform/macos/CHANGELOG.md | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/platform/darwin/src/NSProcessInfo+MGLAdditions.m b/platform/darwin/src/NSProcessInfo+MGLAdditions.m index 1b4fcecf55..0c287c030b 100644 --- a/platform/darwin/src/NSProcessInfo+MGLAdditions.m +++ b/platform/darwin/src/NSProcessInfo+MGLAdditions.m @@ -3,7 +3,8 @@ @implementation NSProcessInfo (MGLAdditions) - (BOOL)mgl_isInterfaceBuilderDesignablesAgent { - return [self.processName hasPrefix:@"IBDesignablesAgent"]; + NSString *processName = self.processName; + return [processName hasPrefix:@"IBAgent"] || [processName hasPrefix:@"IBDesignablesAgent"]; } @end diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index 5bb11a5578..fffbf7423b 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -7,6 +7,7 @@ ### Other changes * Fixed bug where completion block passed to `-[MGLMapSnapshotter startWithQueue:completionHandler:]` was not being called in all code paths. ([#12355](https://github.com/mapbox/mapbox-gl-native/pull/12355)) +* Fixed an issue where `MGLMapView` produced a designable error in Interface Builder storyboards in Xcode 10. ([#12883](https://github.com/mapbox/mapbox-gl-native/pull/12883)) # 0.11.0 - September 12, 2018 |