Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
c55e8c72
Commit
c55e8c72
authored
Jul 15, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Plain Diff
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
Showing
4 changed files
with
12 additions
and
1 deletion
+12
-1
iOSForAppStore-Info-Source.plist
ios/iOSForAppStore-Info-Source.plist
+2
-0
qgroundcontrol.pro
qgroundcontrol.pro
+2
-0
QGCCorePlugin.cc
src/api/QGCCorePlugin.cc
+7
-0
MainWindow.cc
src/ui/MainWindow.cc
+1
-1
No files found.
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
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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