Skip to content

Q
qgroundcontrol
Unverified Commit a34b406b authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #5936 from DonLakeFlyer/iOSBuild 

Fix iOS build
parents f4f20bb0 8a54ef0f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
QGCCommon.pri
View file @ a34b406b
...@@ -83,7 +83,7 @@ linux { ...@@ -83,7 +83,7 @@ linux {
DEFINES += NO_SERIAL_LINK DEFINES += NO_SERIAL_LINK
DEFINES += QGC_DISABLE_UVC DEFINES += QGC_DISABLE_UVC
QMAKE_IOS_DEPLOYMENT_TARGET = 8.0 QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 # Universal QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1,2 # Universal
QMAKE_LFLAGS += -Wl,-no_pie QMAKE_LFLAGS += -Wl,-no_pie
} else { } else {
error("Unsupported build platform, only Linux, Windows, Android and Mac (Mac OS and iOS) are supported") error("Unsupported build platform, only Linux, Windows, Android and Mac (Mac OS and iOS) are supported")
......
QGCSetup.pri
View file @ a34b406b
...@@ -40,7 +40,7 @@ WindowsBuild { ...@@ -40,7 +40,7 @@ WindowsBuild {
# Perform platform specific setup # Perform platform specific setup
# #
iOSBuild | MacBuild { MacBuild {
# Update version info in bundle # Update version info in bundle
QMAKE_POST_LINK += && /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $${MAC_VERSION}\" $$DESTDIR/$${TARGET}.app/Contents/Info.plist QMAKE_POST_LINK += && /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $${MAC_VERSION}\" $$DESTDIR/$${TARGET}.app/Contents/Info.plist
QMAKE_POST_LINK += && /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $${MAC_BUILD}\" $$DESTDIR/$${TARGET}.app/Contents/Info.plist QMAKE_POST_LINK += && /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $${MAC_BUILD}\" $$DESTDIR/$${TARGET}.app/Contents/Info.plist
......
qgroundcontrol.pro
View file @ a34b406b
...@@ -43,8 +43,6 @@ MacBuild { ...@@ -43,8 +43,6 @@ MacBuild {
} }
iOSBuild { iOSBuild {
BUNDLE.files = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/QGCLaunchScreen.xib
QMAKE_BUNDLE_DATA += BUNDLE
LIBS += -framework AVFoundation LIBS += -framework AVFoundation
#-- Info.plist (need an "official" one for the App Store) #-- Info.plist (need an "official" one for the App Store)
ForAppStore { ForAppStore {
...@@ -63,6 +61,8 @@ iOSBuild { ...@@ -63,6 +61,8 @@ iOSBuild {
QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist
OTHER_FILES += $${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 #-- TODO: Add iTunesArtwork
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment