diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-06-13 14:47:13 -0700 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-06-14 10:02:06 +0200 |
| commit | b9702ef41a4cfdd0ab3107cfe5cec16ba3a4c230 (patch) | |
| tree | 21a11f25139c129561d6830932a9eee4f2be895d /platform/darwin | |
| parent | 1e41c151f6edfba69037c854a5cb7abc18bb55e7 (diff) | |
| download | qtlocation-mapboxgl-b9702ef41a4cfdd0ab3107cfe5cec16ba3a4c230.tar.gz | |
[macos] Renamed OS X SDK to macOS SDK
Also renamed as many references to OS X as possible to macOS in documentation.
Diffstat (limited to 'platform/darwin')
| -rw-r--r-- | platform/darwin/README.md | 6 | ||||
| -rw-r--r-- | platform/darwin/src/http_file_source.mm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/platform/darwin/README.md b/platform/darwin/README.md index 43e229028c..349c9a00c0 100644 --- a/platform/darwin/README.md +++ b/platform/darwin/README.md @@ -1,10 +1,10 @@ # Darwin The code in the Darwin platform targets Apple platforms but is not specific -to iOS or OS X. This code is not distributed as an SDK in itself, but is required +to iOS or macOS. This code is not distributed as an SDK in itself, but is required by the [Mapbox iOS SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/ios) -and [Mapbox OS X SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/osx). +and [Mapbox macOS SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/macos). These files depend on the Foundation and Core Foundation frameworks but do not -depend on iOS- or OS X–specific frameworks, such as UIKit or AppKit. Any +depend on iOS- or macOS–specific frameworks, such as UIKit or AppKit. Any non-cross-platform code is guarded by TargetConditionals.h macros. diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm index eb751258c8..a678b6e5cb 100644 --- a/platform/darwin/src/http_file_source.mm +++ b/platform/darwin/src/http_file_source.mm @@ -130,7 +130,7 @@ NSString *HTTPFileSource::Impl::getUserAgent() const { } } - // Avoid %s here because it inserts hidden bidirectional markers on OS X when the system + // Avoid %s here because it inserts hidden bidirectional markers on macOS when the system // language is set to a right-to-left language. [userAgentComponents addObject:[NSString stringWithFormat:@"MapboxGL/%@ (%@)", CFSTR(MBGL_VERSION_STRING), CFSTR(MBGL_VERSION_REV)]]; @@ -139,7 +139,7 @@ NSString *HTTPFileSource::Impl::getUserAgent() const { #if TARGET_OS_IPHONE systemName = @"iOS"; #elif TARGET_OS_MAC - systemName = @"OS X"; + systemName = @"macOS"; #elif TARGET_OS_WATCH systemName = @"watchOS"; #elif TARGET_OS_TV |