Skip to content

Q
qgroundcontrol
Commit f0529fd1 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Fix android build

parent cc79fff0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
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 \
} }
androidBuild { AndroidBuild {
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)
......
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