Skip to content

Q
qgroundcontrol
Commit ade7e59f authored by Bryant's avatar Bryant
Browse files
Options

MAVGen now uses the QGC_FEATURE_ENABLED macro naming to be consistent.

parent ee0768fc
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
QGCExternalLibs.pri
View file @ ade7e59f
...@@ -141,6 +141,9 @@ INCLUDEPATH += $$MAVLINKPATH ...@@ -141,6 +141,9 @@ INCLUDEPATH += $$MAVLINKPATH
# #
contains(DEFINES, ENABLE_MAVGEN) { contains(DEFINES, ENABLE_MAVGEN) {
warning("Including support for MAVLink generator GUI (caution: deprecated)") warning("Including support for MAVLink generator GUI (caution: deprecated)")
# Rename the macro to be consistent with other QGC feature existance macros.
DEFINES -= ENABLE_MAVGEN
DEFINES += QGC_MAVGEN_ENABLED
DEPENDPATH += \ DEPENDPATH += \
src/apps/mavlinkgen src/apps/mavlinkgen
......
src/ui/MainWindow.cc
View file @ ade7e59f
...@@ -73,7 +73,7 @@ This file is part of the QGROUNDCONTROL project ...@@ -73,7 +73,7 @@ This file is part of the QGROUNDCONTROL project
#include "menuactionhelper.h" #include "menuactionhelper.h"
// Add support for the MAVLink generator UI if it's been requested. // Add support for the MAVLink generator UI if it's been requested.
#ifdef ENABLE_MAVGEN #ifdef QGC_MAVGEN_ENABLED
#include "XMLCommProtocolWidget.h" #include "XMLCommProtocolWidget.h"
#endif #endif
...@@ -553,7 +553,7 @@ void MainWindow::buildCommonWidgets() ...@@ -553,7 +553,7 @@ void MainWindow::buildCommonWidgets()
} }
// Add the MAVLink generator UI if it's been requested. // Add the MAVLink generator UI if it's been requested.
#ifdef ENABLE_MAVGEN #ifdef QGC_MAVGEN_ENABLED
if (!mavlinkView) if (!mavlinkView)
{ {
mavlinkView = new SubMainWindow(this); mavlinkView = new SubMainWindow(this);
......
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