diff --git a/build_ios.sh b/build_ios.sh index 3b2e01c..3d3d887 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -14,7 +14,7 @@ mkdir -p ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR} && #-- Create project only (build using Xcode) ${QMAKE} -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=WarningsAsErrorsOn CONFIG-=debug_and_release CONFIG+=release CONFIG+=ForAppStore -rsync -av ${TRAVIS_BUILD_DIR}/ios/Images.xcassets ${SHADOW_BUILD_DIR}/QGroundControl/ +sed -i .bak 's/com.yourcompany.${PRODUCT_NAME:rfc1034identifier}/org.QGroundControl.qgc/' ${SHADOW_BUILD_DIR}/QGroundControl.xcodeproj/project.pbxproj #-- Create and build #${QMAKE} -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=WarningsAsErrorsOn CONFIG-=debug_and_release CONFIG+=release CONFIG+=ForAppStore && #xcodebuild -configuration Release -xcconfig ${TRAVIS_BUILD_DIR}/ios/qgroundcontrol_appstore.xcconfig diff --git a/ios/AppIcon29x29.png b/ios/AppIcon29x29.png deleted file mode 100644 index be15514..0000000 Binary files a/ios/AppIcon29x29.png and /dev/null differ diff --git a/ios/AppIcon29x29@2x.png b/ios/AppIcon29x29@2x.png deleted file mode 100644 index c884191..0000000 Binary files a/ios/AppIcon29x29@2x.png and /dev/null differ diff --git a/ios/AppIcon29x29@2x~ipad.png b/ios/AppIcon29x29@2x~ipad.png deleted file mode 100644 index f7e168a..0000000 Binary files a/ios/AppIcon29x29@2x~ipad.png and /dev/null differ diff --git a/ios/AppIcon29x29~ipad.png b/ios/AppIcon29x29~ipad.png deleted file mode 100644 index 58e563e..0000000 Binary files a/ios/AppIcon29x29~ipad.png and /dev/null differ diff --git a/ios/AppIcon40x40@2x.png b/ios/AppIcon40x40@2x.png deleted file mode 100644 index ef033ee..0000000 Binary files a/ios/AppIcon40x40@2x.png and /dev/null differ diff --git a/ios/AppIcon40x40@2x~ipad.png b/ios/AppIcon40x40@2x~ipad.png deleted file mode 100644 index 6f3bca5..0000000 Binary files a/ios/AppIcon40x40@2x~ipad.png and /dev/null differ diff --git a/ios/AppIcon40x40~ipad.png b/ios/AppIcon40x40~ipad.png deleted file mode 100644 index f451702..0000000 Binary files a/ios/AppIcon40x40~ipad.png and /dev/null differ diff --git a/ios/AppIcon50x50@2x~ipad.png b/ios/AppIcon50x50@2x~ipad.png deleted file mode 100644 index 3ead1eb..0000000 Binary files a/ios/AppIcon50x50@2x~ipad.png and /dev/null differ diff --git a/ios/AppIcon50x50~ipad.png b/ios/AppIcon50x50~ipad.png deleted file mode 100644 index 98efa88..0000000 Binary files a/ios/AppIcon50x50~ipad.png and /dev/null differ diff --git a/ios/AppIcon57x57.png b/ios/AppIcon57x57.png deleted file mode 100644 index 924ae4e..0000000 Binary files a/ios/AppIcon57x57.png and /dev/null differ diff --git a/ios/AppIcon57x57@2x.png b/ios/AppIcon57x57@2x.png deleted file mode 100644 index dc3edd1..0000000 Binary files a/ios/AppIcon57x57@2x.png and /dev/null differ diff --git a/ios/AppIcon60x60@2x.png b/ios/AppIcon60x60@2x.png deleted file mode 100644 index 2977c66..0000000 Binary files a/ios/AppIcon60x60@2x.png and /dev/null differ diff --git a/ios/AppIcon72x72@2x~ipad.png b/ios/AppIcon72x72@2x~ipad.png deleted file mode 100644 index 77f568f..0000000 Binary files a/ios/AppIcon72x72@2x~ipad.png and /dev/null differ diff --git a/ios/AppIcon72x72~ipad.png b/ios/AppIcon72x72~ipad.png deleted file mode 100644 index ca7bbd1..0000000 Binary files a/ios/AppIcon72x72~ipad.png and /dev/null differ diff --git a/ios/AppIcon76x76@2x~ipad.png b/ios/AppIcon76x76@2x~ipad.png deleted file mode 100644 index 044f7cc..0000000 Binary files a/ios/AppIcon76x76@2x~ipad.png and /dev/null differ diff --git a/ios/AppIcon76x76~ipad.png b/ios/AppIcon76x76~ipad.png deleted file mode 100644 index 3628aa9..0000000 Binary files a/ios/AppIcon76x76~ipad.png and /dev/null differ diff --git a/ios/AppIcon83.5x83.5@2x~ipad.png b/ios/AppIcon83.5x83.5@2x~ipad.png deleted file mode 100644 index 072f331..0000000 Binary files a/ios/AppIcon83.5x83.5@2x~ipad.png and /dev/null differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png index 6e9cba2..8da3b54 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png and b/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Contents.json b/ios/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index e737326..0000000 --- a/ios/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "images" : [ - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "2436h", - "filename" : "Default1125x2436.png", - "minimum-system-version" : "11.0", - "orientation" : "portrait", - "scale" : "3x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "2436h", - "filename" : "Default2436x1125.png", - "minimum-system-version" : "11.0", - "orientation" : "landscape", - "scale" : "3x" - }, - { - "orientation" : "landscape", - "idiom" : "tv", - "filename" : "Default3840x2160.png", - "extent" : "full-screen", - "minimum-system-version" : "11.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "tv", - "filename" : "Default1920x1080.png", - "extent" : "full-screen", - "minimum-system-version" : "9.0", - "scale" : "1x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", - "filename" : "Default1242x2208.png", - "minimum-system-version" : "8.0", - "orientation" : "portrait", - "scale" : "3x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", - "filename" : "Default2208x1242.png", - "minimum-system-version" : "8.0", - "orientation" : "landscape", - "scale" : "3x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "667h", - "filename" : "Default750x1334.png", - "minimum-system-version" : "8.0", - "orientation" : "portrait", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default640x960.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "retina4", - "filename" : "Default640x1136.png", - "minimum-system-version" : "7.0", - "orientation" : "portrait", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default768x1024.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default1024x768.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default1536x2048.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default2048x1536.png", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default320x480.png", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default640x960.png", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default640x1136.png", - "extent" : "full-screen", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default768x1024.png", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default1024x768.png", - "extent" : "full-screen", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "filename" : "Default1536x2048.png", - "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "filename" : "Default2048x1536.png", - "extent" : "full-screen", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1024x768.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1024x768.png deleted file mode 100644 index 778c144..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default1024x768.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1125x2436.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1125x2436.png deleted file mode 100644 index 3fe1113..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default1125x2436.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1242x2208.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1242x2208.png deleted file mode 100644 index 601b256..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default1242x2208.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1536x2048.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1536x2048.png deleted file mode 100644 index 68151c2..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default1536x2048.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1920x1080.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1920x1080.png deleted file mode 100644 index 21b35a1..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default1920x1080.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default2048x1536.png b/ios/Images.xcassets/LaunchImage.launchimage/Default2048x1536.png deleted file mode 100644 index 50efd7a..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default2048x1536.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default2208x1242.png b/ios/Images.xcassets/LaunchImage.launchimage/Default2208x1242.png deleted file mode 100644 index 61e7927..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default2208x1242.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default2436x1125.png b/ios/Images.xcassets/LaunchImage.launchimage/Default2436x1125.png deleted file mode 100644 index 25f71a0..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default2436x1125.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default320x480.png b/ios/Images.xcassets/LaunchImage.launchimage/Default320x480.png deleted file mode 100644 index 0f59f02..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default320x480.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default3840x2160.png b/ios/Images.xcassets/LaunchImage.launchimage/Default3840x2160.png deleted file mode 100644 index 4634a83..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default3840x2160.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default640x1136.png b/ios/Images.xcassets/LaunchImage.launchimage/Default640x1136.png deleted file mode 100644 index 458e9b2..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default640x1136.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default640x960.png b/ios/Images.xcassets/LaunchImage.launchimage/Default640x960.png deleted file mode 100644 index c033ad2..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default640x960.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default750x1334.png b/ios/Images.xcassets/LaunchImage.launchimage/Default750x1334.png deleted file mode 100644 index 00a12c5..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default750x1334.png and /dev/null differ diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default768x1024.png b/ios/Images.xcassets/LaunchImage.launchimage/Default768x1024.png deleted file mode 100644 index 83b2a08..0000000 Binary files a/ios/Images.xcassets/LaunchImage.launchimage/Default768x1024.png and /dev/null differ diff --git a/ios/iOS-Info.plist b/ios/iOS-Info.plist index f9ea584..042cab6 100644 --- a/ios/iOS-Info.plist +++ b/ios/iOS-Info.plist @@ -26,8 +26,6 @@ 1 LSRequiresIPhoneOS - UILaunchStoryboardName - QGCLaunchScreen UIRequiresFullScreen CFBundleInfoDictionaryVersion @@ -38,6 +36,8 @@ Ground Station Location NSLocationWhenInUseUsageDescription Ground Station Location + UILaunchStoryboardName + QGCLaunchScreen UISupportedInterfaceOrientations UIInterfaceOrientationLandscapeLeft diff --git a/ios/iOSForAppStore-Info-Source.plist b/ios/iOSForAppStore-Info-Source.plist index 9baabdb..9967773 100644 --- a/ios/iOSForAppStore-Info-Source.plist +++ b/ios/iOSForAppStore-Info-Source.plist @@ -16,51 +16,12 @@ QGC uses UVC devices for video streaming. NSPhotoLibraryUsageDescription We do not access it. Apple thinks we do. + UILaunchStoryboardName + QGCLaunchScreen UIRequiredDeviceCapabilities armv7 - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - AppIcon29x29.png - AppIcon29x29@2x.png - AppIcon40x40@2x.png - AppIcon57x57.png - AppIcon57x57@2x.png - AppIcon60x60@2x.png - - - - CFBundleIcons~ipad - - CFBundlePrimaryIcon - - CFBundleIconFiles - - AppIcon29x29.png - AppIcon29x29@2x.png - AppIcon40x40@2x.png - AppIcon57x57.png - AppIcon57x57@2x.png - AppIcon60x60@2x.png - AppIcon29x29~ipad.png - AppIcon29x29@2x~ipad.png - AppIcon40x40~ipad.png - AppIcon40x40@2x~ipad.png - AppIcon50x50~ipad.png - AppIcon50x50@2x~ipad.png - AppIcon72x72~ipad.png - AppIcon72x72@2x~ipad.png - AppIcon76x76~ipad.png - AppIcon76x76@2x~ipad.png - AppIcon83.5x83.5@2x~ipad.png - - - CFBundleIdentifier org.QGroundControl.qgc CFBundleInfoDictionaryVersion @@ -85,8 +46,6 @@ Ground Station Location NSLocationAlwaysAndWhenInUseUsageDescription Ground Station Location - UILaunchStoryboardName - QGCLaunchScreen NSBluetoothPeripheralUsageDescription QGroundControl would like to use bluetooth. UIRequiresFullScreen diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index c09b079..e0b227d 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -62,9 +62,9 @@ iOSBuild { QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist } - BUNDLE.files = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/QGCLaunchScreen.xib $$QMAKE_INFO_PLIST - QMAKE_BUNDLE_DATA += BUNDLE - #-- TODO: Add iTunesArtwork + QMAKE_ASSET_CATALOGS += ios/Images.xcassets + BUNDLE.files = ios/QGCLaunchScreen.xib $$QMAKE_INFO_PLIST + QMAKE_BUNDLE_DATA += BUNDLE } LinuxBuild {