Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
2f291f28
Commit
2f291f28
authored
Dec 04, 2017
by
Gus Grubba
Browse files
Allow pseudo mobile builds (Native QML on Desktop)
parent
8033f575
Changes
2
Hide whitespace changes
Inline
Side-by-side
qgroundcontrol.pro
View file @
2f291f28
...
@@ -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 @
2f291f28
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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