Skip to content

Q
qgroundcontrol
Unverified Commit 6a75949d authored by Gus Grubba's avatar Gus Grubba Committed by GitHub
Browse files
Options

Merge pull request #5868 from mavlink/pseudoMobile 

Allow pseudo mobile builds (Native QML on Desktop)
parents 8033f575 2f291f28
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
qgroundcontrol.pro
View file @ 6a75949d
...@@ -233,10 +233,12 @@ QT += \ ...@@ -233,10 +233,12 @@ QT += \
multimedia multimedia
} }
!MobileBuild { AndroidBuild || iOSBuild {
QT += \ # Android and iOS don't unclude these
printsupport \ } else {
serialport \ QT += \
printsupport \
serialport \
} }
contains(DEFINES, QGC_ENABLE_BLUETOOTH) { contains(DEFINES, QGC_ENABLE_BLUETOOTH) {
......
src/comm/LinkManager.cc
View file @ 6a75949d
...@@ -613,11 +613,13 @@ void LinkManager::_updateAutoConnectLinks(void) ...@@ -613,11 +613,13 @@ void LinkManager::_updateAutoConnectLinks(void)
} }
// Check for RTK GPS connection gone // Check for RTK GPS connection gone
#if !defined(__mobile__)
if (!_autoConnectRTKPort.isEmpty() && !currentPorts.contains(_autoConnectRTKPort)) { if (!_autoConnectRTKPort.isEmpty() && !currentPorts.contains(_autoConnectRTKPort)) {
qCDebug(LinkManagerLog) << "RTK GPS disconnected" << _autoConnectRTKPort; qCDebug(LinkManagerLog) << "RTK GPS disconnected" << _autoConnectRTKPort;
_toolbox->gpsManager()->disconnectGPS(); _toolbox->gpsManager()->disconnectGPS();
_autoConnectRTKPort.clear(); _autoConnectRTKPort.clear();
} }
#endif
#endif #endif
#endif // NO_SERIAL_LINK #endif // NO_SERIAL_LINK
......
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