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
f0529fd1
Commit
f0529fd1
authored
Mar 13, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix android build
parent
cc79fff0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
qgroundcontrol.pro
qgroundcontrol.pro
+1
-1
MobileScreenMgr.cc
src/MobileScreenMgr.cc
+2
-0
MultiVehicleManager.cc
src/Vehicle/MultiVehicleManager.cc
+0
-4
No files found.
qgroundcontrol.pro
View file @
f0529fd1
...
@@ -369,7 +369,7 @@ iOSBuild {
...
@@ -369,7 +369,7 @@ iOSBuild {
src
/
audio
/
QGCAudioWorker_iOS
.
mm
\
src
/
audio
/
QGCAudioWorker_iOS
.
mm
\
src
/
MobileScreenMgr
.
mm
\
src
/
MobileScreenMgr
.
mm
\
}
}
a
ndroidBuild
{
A
ndroidBuild
{
SOURCES
+=
src
/
MobileScreenMgr
.
cc
\
SOURCES
+=
src
/
MobileScreenMgr
.
cc
\
}
}
...
...
src/MobileScreenMgr.cc
View file @
f0529fd1
...
@@ -26,6 +26,8 @@
...
@@ -26,6 +26,8 @@
#include <QtAndroidExtras/QtAndroidExtras>
#include <QtAndroidExtras/QtAndroidExtras>
#include <QtAndroidExtras/QAndroidJniObject>
#include <QtAndroidExtras/QAndroidJniObject>
static
const
char
*
kJniClassName
=
"org/qgroundcontrol/qgchelper/UsbDeviceJNI"
;
void
MobileScreenMgr
::
setKeepScreenOn
(
bool
keepScreenOn
)
void
MobileScreenMgr
::
setKeepScreenOn
(
bool
keepScreenOn
)
{
{
if
(
keepScreenOn
)
{
if
(
keepScreenOn
)
{
...
...
src/Vehicle/MultiVehicleManager.cc
View file @
f0529fd1
...
@@ -40,10 +40,6 @@ QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "MultiVehicleManagerLog")
...
@@ -40,10 +40,6 @@ QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "MultiVehicleManagerLog")
const
char
*
MultiVehicleManager
::
_gcsHeartbeatEnabledKey
=
"gcsHeartbeatEnabled"
;
const
char
*
MultiVehicleManager
::
_gcsHeartbeatEnabledKey
=
"gcsHeartbeatEnabled"
;
#if defined __android__
static
const
char
*
kJniClassName
=
"org/qgroundcontrol/qgchelper/UsbDeviceJNI"
;
#endif
MultiVehicleManager
::
MultiVehicleManager
(
QGCApplication
*
app
)
MultiVehicleManager
::
MultiVehicleManager
(
QGCApplication
*
app
)
:
QGCTool
(
app
)
:
QGCTool
(
app
)
,
_activeVehicleAvailable
(
false
)
,
_activeVehicleAvailable
(
false
)
...
...
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