summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2018-09-13 00:26:09 -0700
committerMinh Nguyễn <mxn@1ec5.org>2018-09-13 12:52:26 -0700
commitc63e628acc584aa02bb067f5714d5bcd7889f675 (patch)
treeba55fb688771582b4d87d0443c3238fc0a9164fe
parentc470bd26dfb627adbe4b2c7a7b4b7892c1a215f3 (diff)
downloadqtlocation-mapboxgl-c63e628acc584aa02bb067f5714d5bcd7889f675.tar.gz
[ios, macos] Look even more widely for IB designables agent
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.m3
-rw-r--r--platform/macos/CHANGELOG.md2
2 files changed, 4 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 e1ad9ac246..ea40a45fbd 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -7,7 +7,9 @@
* Added an `MGLSymbolStyleLayer.symbolZOrder` property for forcing point features in a symbol layer to be layered in the same order that they are specified in the layer’s associated source. ([#12783](https://github.com/mapbox/mapbox-gl-native/pull/12783))
### Other changes
+
* Fixed an issue where `-[MGLMapSnapshotter startWithQueue:completionHandler:]` failed to call its completion handler in some cases. ([#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 13, 2018