From 8a54ef0ff57b85472a9aea069bd950bcb80b3759 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Sat, 30 Dec 2017 19:18:45 -0800
Subject: [PATCH] Fix iOS build

---
 QGCCommon.pri      | 2 +-
 QGCSetup.pri       | 2 +-
 qgroundcontrol.pro | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/QGCCommon.pri b/QGCCommon.pri
index 0a774aa55..fd42cb041 100644
--- a/QGCCommon.pri
+++ b/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")
diff --git a/QGCSetup.pri b/QGCSetup.pri
index 48e400b51..b0e79290c 100644
--- a/QGCSetup.pri
+++ b/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
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index c7dd80f4d..1609e178c 100644
--- a/qgroundcontrol.pro
+++ b/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
 }
 
-- 
2.22.0