From 24e75cfbba33c59744efb3920ae7385fb66912ba Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Fri, 13 Nov 2015 12:18:50 -0800 Subject: [PATCH] Fix android build --- src/comm/MAVLinkProtocol.cc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/comm/MAVLinkProtocol.cc b/src/comm/MAVLinkProtocol.cc index ff3681a65..42c3552ce 100644 --- a/src/comm/MAVLinkProtocol.cc +++ b/src/comm/MAVLinkProtocol.cc @@ -108,9 +108,7 @@ void MAVLinkProtocol::setToolbox(QGCToolbox *toolbox) connect(this, &MAVLinkProtocol::protocolStatusMessage, _app, &QGCApplication::criticalMessageBoxOnMainThread); connect(this, &MAVLinkProtocol::saveTempFlightDataLog, _app, &QGCApplication::saveTempFlightDataLogOnMainThread); -#ifndef __mobile__ connect(_multiVehicleManager->vehicles(), &QmlObjectListModel::countChanged, this, &MAVLinkProtocol::_vehicleCountChanged); -#endif emit versionCheckChanged(m_enable_version_check); } @@ -631,6 +629,18 @@ int MAVLinkProtocol::getHeartbeatRate() return _heartbeatRate; } +void MAVLinkProtocol::_vehicleCountChanged(int count) +{ +#ifndef __mobile__ + if (count == 0) { + // Last vehicle is gone, close out logging + _stopLogging(); + } +#else + Q_UNUSED(count); +#endif +} + #ifndef __mobile__ /// @brief Closes the log file if it is open bool MAVLinkProtocol::_closeLogFile(void) @@ -726,12 +736,4 @@ void MAVLinkProtocol::deleteTempLogFiles(void) QFile::remove(fileInfo.filePath()); } } - -void MAVLinkProtocol::_vehicleCountChanged(int count) -{ - if (count == 0) { - // Last vehicle is gone, close out logging - _stopLogging(); - } -} #endif -- 2.22.0