Fix iOS build

QGCCommon.pri

@@ -83,7 +83,7 @@ linux {
     DEFINES += NO_SERIAL_LINK
     DEFINES += QGC_DISABLE_UVC
     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
 } else {
     error("Unsupported build platform, only Linux, Windows, Android and Mac (Mac OS and iOS) are supported")

QGCSetup.pri

@@ -40,7 +40,7 @@ WindowsBuild {
 # Perform platform specific setup
 #
 
-iOSBuild | MacBuild {
+MacBuild {
     # 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 :CFBundleVersion $${MAC_BUILD}\" $$DESTDIR/$${TARGET}.app/Contents/Info.plist

qgroundcontrol.pro

@@ -43,8 +43,6 @@ MacBuild {
 }
 
 iOSBuild {
-    BUNDLE.files        = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/QGCLaunchScreen.xib
-    QMAKE_BUNDLE_DATA  += BUNDLE
     LIBS               += -framework AVFoundation
     #-- Info.plist (need an "official" one for the App Store)
     ForAppStore {
@@ -63,6 +61,8 @@ 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
 }