diff options
author | M.Stephen <truestyle2005@163.com> | 2019-12-12 18:50:19 +0800 |
---|---|---|
committer | M.Stephen <truestyle2005@163.com> | 2019-12-12 18:50:19 +0800 |
commit | 0f07dd31fea0fbde6a474c1c23cf36fafc92388e (patch) | |
tree | 8c499e9641174ae260c7abb17ced0561324b3e4f | |
parent | f72d5f52b3cb974525ef9b3f9fe63abd55eec537 (diff) | |
download | qtlocation-mapboxgl-0f07dd31fea0fbde6a474c1c23cf36fafc92388e.tar.gz |
update mac os
-rw-r--r-- | platform/macos/macos.xcodeproj/project.pbxproj | 16 | ||||
-rw-r--r-- | platform/macos/sdk-files.json | 2 | ||||
-rw-r--r-- | platform/macos/src/MGLMapView.mm | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj index 5bb5e87049..7dcd72b47d 100644 --- a/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/macos/macos.xcodeproj/project.pbxproj @@ -135,6 +135,8 @@ CA9461A620884CCB0015EB12 /* MGLAnnotationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CA9461A520884CCB0015EB12 /* MGLAnnotationTests.m */; }; CAD9D0AC22A88A32001B25EE /* MGLResourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = CAD9D0AB22A88A32001B25EE /* MGLResourceTests.mm */; }; CF762DEF22DC7EFF00338472 /* MGLLoggingConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = CF762DEE22DC7EFF00338472 /* MGLLoggingConfiguration.mm */; }; + CFF9F98D23A2505700B0DE92 /* MGLNetworkIntegrationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CFF9F98B23A2505700B0DE92 /* MGLNetworkIntegrationManager.m */; }; + CFF9F98E23A2505700B0DE92 /* MGLNetworkIntegrationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CFF9F98C23A2505700B0DE92 /* MGLNetworkIntegrationManager.h */; }; DA00FC8A1D5EEAC3009AABC8 /* MGLAttributionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DA00FC881D5EEAC3009AABC8 /* MGLAttributionInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA00FC8B1D5EEAC3009AABC8 /* MGLAttributionInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = DA00FC891D5EEAC3009AABC8 /* MGLAttributionInfo.mm */; }; DA0CD58E1CF56F5800A5F5A5 /* MGLFeatureTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = DA0CD58D1CF56F5800A5F5A5 /* MGLFeatureTests.mm */; }; @@ -476,6 +478,8 @@ CA9461A520884CCB0015EB12 /* MGLAnnotationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MGLAnnotationTests.m; path = test/MGLAnnotationTests.m; sourceTree = SOURCE_ROOT; }; CAD9D0AB22A88A32001B25EE /* MGLResourceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLResourceTests.mm; path = ../../darwin/test/MGLResourceTests.mm; sourceTree = "<group>"; }; CF762DEE22DC7EFF00338472 /* MGLLoggingConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLLoggingConfiguration.mm; sourceTree = "<group>"; }; + CFF9F98B23A2505700B0DE92 /* MGLNetworkIntegrationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MGLNetworkIntegrationManager.m; path = ../../darwin/src/MGLNetworkIntegrationManager.m; sourceTree = "<group>"; }; + CFF9F98C23A2505700B0DE92 /* MGLNetworkIntegrationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MGLNetworkIntegrationManager.h; path = ../../darwin/src/MGLNetworkIntegrationManager.h; sourceTree = "<group>"; }; DA00FC881D5EEAC3009AABC8 /* MGLAttributionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAttributionInfo.h; sourceTree = "<group>"; }; DA00FC891D5EEAC3009AABC8 /* MGLAttributionInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLAttributionInfo.mm; sourceTree = "<group>"; }; DA0CD58D1CF56F5800A5F5A5 /* MGLFeatureTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLFeatureTests.mm; path = ../../darwin/test/MGLFeatureTests.mm; sourceTree = "<group>"; }; @@ -880,6 +884,15 @@ name = "Test Helpers"; sourceTree = "<group>"; }; + CFF9F98A23A2503300B0DE92 /* Interface */ = { + isa = PBXGroup; + children = ( + CFF9F98C23A2505700B0DE92 /* MGLNetworkIntegrationManager.h */, + CFF9F98B23A2505700B0DE92 /* MGLNetworkIntegrationManager.m */, + ); + name = Interface; + sourceTree = "<group>"; + }; DA33895E1FA3E997001EA329 /* Recovered References */ = { isa = PBXGroup; children = ( @@ -1267,6 +1280,7 @@ DAE6C39E1CC31E7C00DB3429 /* Kit */ = { isa = PBXGroup; children = ( + CFF9F98A23A2503300B0DE92 /* Interface */, DA90B12C1DB43B180073CF55 /* Categories */, DAE6C39F1CC31E9400DB3429 /* MGLAnnotationImage.h */, DAC2ABC41CC6D343006D18C4 /* MGLAnnotationImage_Private.h */, @@ -1356,6 +1370,7 @@ DA7DC9811DED5F5C0027472F /* MGLVectorTileSource_Private.h in Headers */, DAE6C3861CC31E2A00DB3429 /* MGLGeometry_Private.h in Headers */, DAE6C3841CC31E2A00DB3429 /* MGLAccountManager_Private.h in Headers */, + CFF9F98E23A2505700B0DE92 /* MGLNetworkIntegrationManager.h in Headers */, DACA8622201920BE00E9693A /* MGLRasterDEMSource.h in Headers */, DAE6C3691CC31E0400DB3429 /* MGLTypes.h in Headers */, 07D9474D1F67441B00E37934 /* MGLComputedShapeSource_Private.h in Headers */, @@ -1688,6 +1703,7 @@ 408AA86A1DAEEE5D00022900 /* NSDictionary+MGLAdditions.mm in Sources */, DA8F25881D51C9E10010E6B5 /* MGLBackgroundStyleLayer.mm in Sources */, DA551B841DB496AC0009AFAF /* MGLTileSource.mm in Sources */, + CFF9F98D23A2505700B0DE92 /* MGLNetworkIntegrationManager.m in Sources */, DAE6C3B81CC31EF300DB3429 /* MGLMapView+IBAdditions.mm in Sources */, DA35A2D01CCAAED300E826B2 /* NSValue+MGLAdditions.m in Sources */, 3538AA241D542685008EC33D /* MGLStyleLayer.mm in Sources */, diff --git a/platform/macos/sdk-files.json b/platform/macos/sdk-files.json index 13760da70f..65b946cd06 100644 --- a/platform/macos/sdk-files.json +++ b/platform/macos/sdk-files.json @@ -37,6 +37,7 @@ "platform/darwin/src/NSDictionary+MGLAdditions.mm", "platform/darwin/src/MGLBackgroundStyleLayer.mm", "platform/darwin/src/MGLTileSource.mm", + "platform/darwin/src/MGLNetworkIntegrationManager.m", "platform/macos/src/MGLMapView+IBAdditions.mm", "platform/darwin/src/NSValue+MGLAdditions.m", "platform/darwin/src/MGLStyleLayer.mm", @@ -171,6 +172,7 @@ "MGLVectorTileSource_Private.h": "platform/darwin/src/MGLVectorTileSource_Private.h", "MGLGeometry_Private.h": "platform/darwin/src/MGLGeometry_Private.h", "MGLAccountManager_Private.h": "platform/darwin/src/MGLAccountManager_Private.h", + "MGLNetworkIntegrationManager.h": "platform/darwin/src/MGLNetworkIntegrationManager.h", "MGLComputedShapeSource_Private.h": "platform/darwin/src/MGLComputedShapeSource_Private.h", "NSException+MGLAdditions.h": "platform/darwin/src/NSException+MGLAdditions.h", "MGLTileSource_Private.h": "platform/darwin/src/MGLTileSource_Private.h", diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 30285a9684..b5bd94d3d5 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -57,7 +57,7 @@ #import "NSImage+MGLAdditions.h" #import "NSPredicate+MGLPrivateAdditions.h" #import "MGLLoggingConfiguration_Private.h" -#import "MGLNativeInterfaceReceiver.h" +#import "MGLNetworkIntegrationManager.h" class MGLAnnotationContext; @@ -259,7 +259,7 @@ public: } - (void)commonInit { - MGLNativeAppleInterfaceTransmitter.shared.delegate = MGLNativeInterfaceReceiver.shared; + MGLNativeNetworkDelegate.shared.delegate = MGLNetworkIntegrationManager.shared; _isTargetingInterfaceBuilder = NSProcessInfo.processInfo.mgl_isInterfaceBuilderDesignablesAgent; // Set up cross-platform controllers and resources. |