MAVGen now uses the QGC_FEATURE_ENABLED macro naming to be consistent.

QGCExternalLibs.pri

@@ -141,6 +141,9 @@ INCLUDEPATH += $$MAVLINKPATH
 #
 contains(DEFINES, ENABLE_MAVGEN) {
 	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 += \
 		src/apps/mavlinkgen
 

src/ui/MainWindow.cc

@@ -73,7 +73,7 @@ This file is part of the QGROUNDCONTROL project
 #include "menuactionhelper.h"
 
 // Add support for the MAVLink generator UI if it's been requested.
-#ifdef ENABLE_MAVGEN
+#ifdef QGC_MAVGEN_ENABLED
 #include "XMLCommProtocolWidget.h"
 #endif
 
@@ -553,7 +553,7 @@ void MainWindow::buildCommonWidgets()
     }
 
 // Add the MAVLink generator UI if it's been requested.
-#ifdef ENABLE_MAVGEN
+#ifdef QGC_MAVGEN_ENABLED
     if (!mavlinkView)
     {
         mavlinkView = new SubMainWindow(this);