Commit e1bc02f6 authored by Bryant's avatar Bryant

Added the QGC_GOOGLE_EARTH_ENABLED macro when that support exists.

parent ade7e59f
...@@ -268,13 +268,15 @@ OSGDependency { ...@@ -268,13 +268,15 @@ OSGDependency {
# #
contains(DEFINES, DISABLE_GOOGLE_EARTH) { 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 { } else:MacBuild {
message("Including support for Google Earth view") message("Including support for Google Earth view")
DEFINES += QGC_GOOGLE_EARTH_ENABLED
HEADERS += src/ui/map3D/QGCGoogleEarthView.h HEADERS += src/ui/map3D/QGCGoogleEarthView.h
SOURCES += src/ui/map3D/QGCGoogleEarthView.cc SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
} else:WindowsBuild { } else:WindowsBuild {
message("Including support for Google Earth view") message("Including support for Google Earth view")
DEFINES += QGC_GOOGLE_EARTH_ENABLED
HEADERS += src/ui/map3D/QGCGoogleEarthView.h HEADERS += src/ui/map3D/QGCGoogleEarthView.h
SOURCES += src/ui/map3D/QGCGoogleEarthView.cc SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
CONFIG += qaxcontainer CONFIG += qaxcontainer
......
...@@ -679,7 +679,7 @@ void MainWindow::buildCommonWidgets() ...@@ -679,7 +679,7 @@ void MainWindow::buildCommonWidgets()
} }
#endif #endif
#ifndef DISABLE_GOOGLE_EARTH #ifdef QGC_GOOGLE_EARTH_ENABLED
if (!earthWidget) if (!earthWidget)
{ {
earthWidget = new QGCGoogleEarthView(this); earthWidget = new QGCGoogleEarthView(this);
......
...@@ -61,7 +61,7 @@ This file is part of the QGROUNDCONTROL project ...@@ -61,7 +61,7 @@ This file is part of the QGROUNDCONTROL project
#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"
...@@ -416,7 +416,7 @@ protected: ...@@ -416,7 +416,7 @@ protected:
#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; QPointer<QGCGoogleEarthView> earthWidget;
#endif #endif
QPointer<QGCFirmwareUpdate> firmwareUpdateWidget; QPointer<QGCFirmwareUpdate> firmwareUpdateWidget;
......
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