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
c55e8c72
Commit
c55e8c72
authored
Jul 15, 2017
by
DonLakeFlyer
Browse files
Merge branch 'Stable_V3.2' of
https://github.com/mavlink/qgroundcontrol
into StableMerge
parents
02323902
bc4ee574
Changes
4
Hide whitespace changes
Inline
Side-by-side
ios/iOSForAppStore-Info-Source.plist
View file @
c55e8c72
...
...
@@ -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 @
c55e8c72
...
...
@@ -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 @
c55e8c72
...
...
@@ -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
...
...
src/ui/MainWindow.cc
View file @
c55e8c72
...
...
@@ -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
);
}
...
...
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