summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@libreoffice.org>2018-05-19 21:07:35 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-05-19 14:05:23 -0700
commit090eb1ee34b28cc0332b92ea8c8dc173e52fc0c4 (patch)
treede99b166306b6e5f402c746b2111c42fda5a7f27 /packaging
parent7836a78dca42da91abeaec9f6c28a063ddfb1716 (diff)
downloadsubsurface-090eb1ee34b28cc0332b92ea8c8dc173e52fc0c4.tar.gz
iOS, remove linker warnings (version mismatch).
The Qt libraries are compiled as iOS 10.0, we link as iOS 8.0, this is a problem waiting to happen. First time we use a Qt function that uses a iOS 10.0 specific function the app will crash. Bumping iOS minimum version from 8.0 to 10.0 Removing the 76x icon, which are not valid from 10.0 and forward Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/ios/Subsurface-mobile/Subsurface-mobile.pro2
-rw-r--r--packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76.pngbin16692 -> 0 bytes
-rw-r--r--packaging/ios/storeIcon.xcassets/AppIcon.appiconset/Contents.json8
3 files changed, 2 insertions, 8 deletions
diff --git a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
index 0f9b2f30e..4e12db34b 100644
--- a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
+++ b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
@@ -222,5 +222,5 @@ ios {
images.files = ../../../icons/subsurface-mobile-icon.png
QMAKE_BUNDLE_DATA += app_launch_images images
QMAKE_INFO_PLIST = ../Info.plist
- QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
+ QMAKE_IOS_DEPLOYMENT_TARGET = 10.0
}
diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76.png
deleted file mode 100644
index 370d85a11..000000000
--- a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76.png
+++ /dev/null
Binary files differ
diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/Contents.json b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/Contents.json
index 1962012ed..3f0c82063 100644
--- a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/Contents.json
+++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/Contents.json
@@ -87,12 +87,6 @@
{
"size" : "76x76",
"idiom" : "ipad",
- "filename" : "AppIcon-76.png",
- "scale" : "1x"
- },
- {
- "size" : "76x76",
- "idiom" : "ipad",
"filename" : "AppIcon-76@2x.png",
"scale" : "2x"
},
@@ -113,4 +107,4 @@
"version" : 1,
"author" : "xcode"
}
-} \ No newline at end of file
+}