Merge pull request #5443 from DonLakeFlyer/StableMerge

Stable merge

ios/iOSForAppStore-Info-Source.plist

@@ -85,6 +85,8 @@
 	<string>Ground Station Location</string>
 	<key>UILaunchStoryboardName</key>
 	<string>QGCLaunchScreen</string>
+    <key>NSBluetoothPeripheralUsageDescription</key>
+    <string>QGroundControl would like to use bluetooth.</string>    
 	<key>UIRequiresFullScreen</key>
 	<true/>
 	<key>UISupportedInterfaceOrientations</key>

qgroundcontrol.pro

@@ -55,6 +55,8 @@ iOSBuild {
         count(APP_ERROR, 1) {
             error("Error building .plist file. 'ForAppStore' builds are only possible through the official build system.")
         }
+        QT               += qml-private
+        CONFIG           += qtquickcompiler
         QMAKE_INFO_PLIST  = $${BASEDIR}/ios/iOSForAppStore-Info.plist
         OTHER_FILES      += $${BASEDIR}/ios/iOSForAppStore-Info.plist
     } else {

src/api/QGCCorePlugin.cc

@@ -176,6 +176,13 @@ bool QGCCorePlugin::adjustSettingMetaData(FactMetaData& metaData)
         metaData.setRawDefaultValue(true);
         return true;
 #endif
+#if defined(__ios__)
+    } else if (metaData.name() == AppSettings::savePathName) {
+        QString appName = qgcApp()->applicationName();
+        QDir rootDir = QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
+        metaData.setRawDefaultValue(rootDir.filePath(appName));
+        return false;
+#endif
     }
     return true; // Show setting in ui
 }

src/ui/MainWindow.cc

@@ -296,7 +296,7 @@ QString MainWindow::_getWindowGeometryKey()
 #ifndef __mobile__
 MAVLinkDecoder* MainWindow::_mavLinkDecoderInstance(void)
 {
-    if (_mavlinkDecoder) {
+    if (!_mavlinkDecoder) {
         _mavlinkDecoder = new MAVLinkDecoder(qgcApp()->toolbox()->mavlinkProtocol());
         connect(_mavlinkDecoder, &MAVLinkDecoder::valueChanged, this, &MainWindow::valueChanged);
     }