Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
d000ecef
Commit
d000ecef
authored
Jul 12, 2017
by
Gus Grubba
Committed by
GitHub
Jul 12, 2017
Browse files
Merge pull request #5427 from dogmaphobic/iOSFixes
iOS fixes
parents
4f7b0ece
5f3729db
Changes
3
Hide whitespace changes
Inline
Side-by-side
ios/iOSForAppStore-Info-Source.plist
View file @
d000ecef
...
...
@@ -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
View file @
d000ecef
...
...
@@ -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
View file @
d000ecef
...
...
@@ -175,6 +175,13 @@ bool QGCCorePlugin::adjustSettingMetaData(FactMetaData& metaData)
#else
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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment