diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2016-04-24 16:41:19 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2016-04-24 16:41:19 -0700 |
commit | 540bbc537ea25aaa4723eedc4549e0b76c503567 (patch) | |
tree | ec31c5d57dcade7384e2dbcb9088f0139c1af513 | |
parent | 19f4236ebb10b09b0f2575c46c9f9214b16cd5f8 (diff) | |
download | qtlocation-mapboxgl-540bbc537ea25aaa4723eedc4549e0b76c503567.tar.gz |
[ios] Fixed ios-test build warnings
-rw-r--r-- | platform/ios/uitest/Images.xcassets/AppIcon.appiconset/Contents.json | 94 | ||||
-rw-r--r-- | platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj | 14 |
2 files changed, 4 insertions, 104 deletions
diff --git a/platform/ios/uitest/Images.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/uitest/Images.xcassets/AppIcon.appiconset/Contents.json index f535da681c..eeea76c2db 100644 --- a/platform/ios/uitest/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/platform/ios/uitest/Images.xcassets/AppIcon.appiconset/Contents.json @@ -3,11 +3,6 @@ { "idiom" : "iphone", "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "size" : "29x29", "scale" : "2x" }, { @@ -27,16 +22,6 @@ }, { "idiom" : "iphone", - "size" : "57x57", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "size" : "57x57", - "scale" : "2x" - }, - { - "idiom" : "iphone", "size" : "60x60", "scale" : "2x" }, @@ -67,26 +52,6 @@ }, { "idiom" : "ipad", - "size" : "50x50", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "50x50", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "72x72", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "72x72", - "scale" : "2x" - }, - { - "idiom" : "ipad", "size" : "76x76", "scale" : "1x" }, @@ -99,65 +64,6 @@ "idiom" : "ipad", "size" : "83.5x83.5", "scale" : "2x" - }, - { - "size" : "24x24", - "idiom" : "watch", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "38mm" - }, - { - "size" : "27.5x27.5", - "idiom" : "watch", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "42mm" - }, - { - "size" : "29x29", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "watch", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "38mm" - }, - { - "size" : "44x44", - "idiom" : "watch", - "scale" : "2x", - "role" : "longLook", - "subtype" : "42mm" - }, - { - "size" : "86x86", - "idiom" : "watch", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "38mm" - }, - { - "size" : "98x98", - "idiom" : "watch", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "42mm" - }, - { - "idiom" : "car", - "size" : "120x120", - "scale" : "1x" } ], "info" : { diff --git a/platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj b/platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj index f033d51da3..1e93209099 100644 --- a/platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj +++ b/platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj @@ -400,7 +400,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - SYMROOT = "../../../build/ios"; + SYMROOT = ../../../build/ios; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -434,7 +434,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; SDKROOT = iphoneos; - SYMROOT = "../../../build/ios"; + SYMROOT = ../../../build/ios; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -445,10 +445,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/../../../build/ios/pkg/dynamic/", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = "$(SRCROOT)/App-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -466,10 +463,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/../../../build/ios/pkg/dynamic/", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = "$(SRCROOT)/App-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; |