summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Rex <julian.rex@mapbox.com>2018-05-03 20:34:56 -0400
committerJulian Rex <julian.rex@mapbox.com>2018-05-17 17:01:13 -0400
commit9a466ecd0b55789b24446ec1f897be213344e303 (patch)
treee3bd01e828f5bf881f07a75e7e0ebda1ce8db72c
parent81bd7673d2b0c95bdb8970397a3a3e1a5e734b18 (diff)
downloadqtlocation-mapboxgl-upstream/jrex-pending-test-macro.tar.gz
Moved utility header into Darwinupstream/jrex-pending-test-macro
-rw-r--r--platform/darwin/test/MGLTestUtility.h (renamed from platform/ios/test/MGLTestUtility.h)0
-rw-r--r--platform/ios/ios.xcodeproj/project.pbxproj4
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/ios/test/MGLTestUtility.h b/platform/darwin/test/MGLTestUtility.h
index 2e02e4f9de..2e02e4f9de 100644
--- a/platform/ios/test/MGLTestUtility.h
+++ b/platform/darwin/test/MGLTestUtility.h
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index 68ba1ca6ae..214eb5a776 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -998,9 +998,9 @@
AC518DFE201BB55A00EBC820 /* MGLTelemetryConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLTelemetryConfig.m; sourceTree = "<group>"; };
CA0C27932076CA19001CE5B7 /* MGLMapViewIntegrationTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLMapViewIntegrationTest.m; sourceTree = "<group>"; };
CA0C27952076CA50001CE5B7 /* MGLMapViewIntegrationTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLMapViewIntegrationTest.h; sourceTree = "<group>"; };
- CA3B1629209801A5005C087B /* MGLTestUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLTestUtility.h; sourceTree = "<group>"; };
CA4EB8C620863487006AB465 /* MGLStyleLayerIntegrationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLStyleLayerIntegrationTests.m; sourceTree = "<group>"; };
CA55CD3E202C16AA00CE7095 /* MGLCameraChangeReason.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLCameraChangeReason.h; sourceTree = "<group>"; };
+ CA5E5042209BDC5F001A8A81 /* MGLTestUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MGLTestUtility.h; path = ../../darwin/test/MGLTestUtility.h; sourceTree = "<group>"; };
DA00FC8C1D5EEB0D009AABC8 /* MGLAttributionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAttributionInfo.h; sourceTree = "<group>"; };
DA00FC8D1D5EEB0D009AABC8 /* MGLAttributionInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLAttributionInfo.mm; sourceTree = "<group>"; };
DA0CD58F1CF56F6A00A5F5A5 /* MGLFeatureTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLFeatureTests.mm; path = ../../darwin/test/MGLFeatureTests.mm; sourceTree = "<group>"; };
@@ -1530,8 +1530,8 @@
4031ACFD1E9FD26900A3EA26 /* Test Helpers */ = {
isa = PBXGroup;
children = (
+ CA5E5042209BDC5F001A8A81 /* MGLTestUtility.h */,
4031ACFE1E9FD29F00A3EA26 /* MGLSDKTestHelpers.swift */,
- CA3B1629209801A5005C087B /* MGLTestUtility.h */,
);
name = "Test Helpers";
sourceTree = "<group>";