diff --git a/QGCApplication.pro b/QGCApplication.pro
index 5a87bd60887e528baae858c70af73362a9b8c342..c92bb942688663eaad057ddf630879b07ddcd37c 100644
--- a/QGCApplication.pro
+++ b/QGCApplication.pro
@@ -33,7 +33,7 @@ LinuxBuild {
     CONFIG += link_pkgconfig
 }
 
-# QGC QtLocation plugin
+# QGC QtLocation plugin (for ios, it's all compiled in with the rest.)
 
 !ios {
     LIBS += -L$${LOCATION_PLUGIN_DESTDIR}
@@ -86,10 +86,8 @@ MacBuild {
 iOSBuild {
     QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist
     OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist
-    ios_icon.files = $$files($$PWD/ios/AppIcon*.png)
-    QMAKE_BUNDLE_DATA += ios_icon
-    app_launch_images.files = $$PWD/ios/LaunchScreen.xib
-    QMAKE_BUNDLE_DATA += app_launch_images
+    BUNDLE.files = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/LaunchScreen.xib
+    QMAKE_BUNDLE_DATA += BUNDLE
     #-- TODO: Add iTunesArtwork
 }
 
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 259878f7e12e12e26fde335802ac6901f9ef8e5e..2293821b967e45a30854c310e12a82c181d5b825 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -28,9 +28,15 @@ message(Qt version $$[QT_VERSION])
 }
 
 ios {
+    #-- Qmake can't handle a project within a project when generating
+    #   an Xcode project. You end up with one project for the app and
+    #   nothing for the location plugin.
     include($$PWD/src/QtLocationPlugin/QGCLocationPlugin.pro)
     include($$PWD/QGCApplication.pro)
 } else {
+    #-- The rest (make files or Visual Studio projects) works. Note
+    #   that by default, we're using make files for Mac OS too. If
+    #   you want an Xcode project, the same above applies.
     TEMPLATE =  subdirs
     SUBDIRS  =  ./src/QtLocationPlugin/QGCLocationPlugin.pro
     SUBDIRS +=  ./QGCApplication.pro
diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 899327f93cca337806fcd8087b9e55929822492c..1d0e4d62ba65c75abc94a9fe515ea5150f5cd8cf 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -291,7 +291,15 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
     this->setApplicationVersion(versionString);
 
     // Set settings format
+#if !defined(__mobile__) && !defined(__macos__)
     QSettings::setDefaultFormat(QSettings::IniFormat);
+#else
+    QString settingsLocation = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
+    if(!settingsLocation.isEmpty())
+    {
+        QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, settingsLocation);
+    }
+#endif
 
     QSettings settings;
     qDebug() << "Settings location" << settings.fileName() << settings.isWritable();