Added the QGC_GOOGLE_EARTH_ENABLED macro when that support exists.

QGCExternalLibs.pri

@@ -267,14 +267,16 @@ OSGDependency {
 # Only supported on Mac and Windows where Google Earth can be installed.
 #
 contains(DEFINES, DISABLE_GOOGLE_EARTH) {
-	message("Skipping support for Google Earth view (manual override)")
+    message("Skipping support for Google Earth view (manual override)")
+    DEFINES -= DISABLE_GOOGLE_EARTH
 } else:MacBuild {
     message("Including support for Google Earth view")
+    DEFINES += QGC_GOOGLE_EARTH_ENABLED
     HEADERS += src/ui/map3D/QGCGoogleEarthView.h
     SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
 } else:WindowsBuild {
     message("Including support for Google Earth view")
-
+    DEFINES += QGC_GOOGLE_EARTH_ENABLED
     HEADERS += src/ui/map3D/QGCGoogleEarthView.h
     SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
     CONFIG += qaxcontainer

src/ui/MainWindow.cc

@@ -676,13 +676,13 @@ void MainWindow::buildCommonWidgets()
         q3DWidget->setObjectName("VIEW_3DWIDGET");
 
         addToCentralStackedWidget(q3DWidget, VIEW_3DWIDGET, tr("Local 3D"));
-    }
+    }
-#endif
+#endif
-
+
-#ifndef DISABLE_GOOGLE_EARTH
+#ifdef QGC_GOOGLE_EARTH_ENABLED
-    if (!earthWidget)
+    if (!earthWidget)
-    {
+    {
-        earthWidget = new QGCGoogleEarthView(this);
+        earthWidget = new QGCGoogleEarthView(this);
         addToCentralStackedWidget(earthWidget, VIEW_GOOGLEEARTH, tr("Google Earth"));
     }
 #endif

src/ui/MainWindow.h

@@ -58,13 +58,13 @@ This file is part of the QGROUNDCONTROL project
 #include "ParameterInterface.h"
 #include "HDDisplay.h"
 #include "WatchdogControl.h"
-#include "HSIDisplay.h"
+#include "HSIDisplay.h"
-#include "QGCRemoteControlView.h"
+#include "QGCRemoteControlView.h"
-#include "opmapcontrol.h"
+#include "opmapcontrol.h"
-#ifndef DISABLE_GOOGLE_EARTH
+#ifdef QGC_GOOGLE_EARTH_ENABLED
-#include "QGCGoogleEarthView.h"
+#include "QGCGoogleEarthView.h"
-#endif
+#endif
-#include "QGCToolBar.h"
+#include "QGCToolBar.h"
 #include "SlugsDataSensorView.h"
 #include "LogCompressor.h"
 
@@ -413,13 +413,13 @@ protected:
     //QPointer<QGCMapTool> mapWidget;
     //QPointer<XMLCommProtocolWidget> protocolWidget;
     //QPointer<QGCDataPlot2D> dataplotWidget;
-#ifdef QGC_OSG_ENABLED
+#ifdef QGC_OSG_ENABLED
-    QPointer<QWidget> q3DWidget;
+    QPointer<QWidget> q3DWidget;
-#endif
+#endif
-#ifndef DISABLE_GOOGLE_EARTH
+#ifdef QGC_GOOGLE_EARTH_ENABLED
 	QPointer<QGCGoogleEarthView> earthWidget;
-#endif
+#endif
-    QPointer<QGCFirmwareUpdate> firmwareUpdateWidget;
+    QPointer<QGCFirmwareUpdate> firmwareUpdateWidget;
 
     // Dock widgets
     QPointer<QDockWidget> controlDockWidget;