Commit d000ecef authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #5427 from dogmaphobic/iOSFixes

iOS fixes
parents 4f7b0ece 5f3729db
...@@ -85,6 +85,8 @@ ...@@ -85,6 +85,8 @@
<string>Ground Station Location</string> <string>Ground Station Location</string>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
<string>QGCLaunchScreen</string> <string>QGCLaunchScreen</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>QGroundControl would like to use bluetooth.</string>
<key>UIRequiresFullScreen</key> <key>UIRequiresFullScreen</key>
<true/> <true/>
<key>UISupportedInterfaceOrientations</key> <key>UISupportedInterfaceOrientations</key>
......
...@@ -55,6 +55,8 @@ iOSBuild { ...@@ -55,6 +55,8 @@ iOSBuild {
count(APP_ERROR, 1) { count(APP_ERROR, 1) {
error("Error building .plist file. 'ForAppStore' builds are only possible through the official build system.") 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 QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOSForAppStore-Info.plist
OTHER_FILES += $${BASEDIR}/ios/iOSForAppStore-Info.plist OTHER_FILES += $${BASEDIR}/ios/iOSForAppStore-Info.plist
} else { } else {
......
...@@ -175,6 +175,13 @@ bool QGCCorePlugin::adjustSettingMetaData(FactMetaData& metaData) ...@@ -175,6 +175,13 @@ bool QGCCorePlugin::adjustSettingMetaData(FactMetaData& metaData)
#else #else
metaData.setRawDefaultValue(true); metaData.setRawDefaultValue(true);
return 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 #endif
} }
return true; // Show setting in ui return true; // Show setting in ui
......
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