From 58a71b67147ba1d69f4a5621c28b7a5d85589f8e Mon Sep 17 00:00:00 2001 From: lm Date: Tue, 28 Dec 2010 13:26:20 +0100 Subject: [PATCH] Completely deactivated Google Earth plugin on systems not supporting it --- qgroundcontrol.pro | 12 ++++++++++-- src/ui/MainWindow.h | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 1d761bbba..eadd028c0 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -245,7 +245,6 @@ HEADERS += src/MG.h \ src/comm/QGCMAVLink.h \ src/ui/QGCWebView.h \ src/ui/map3D/QGCWebPage.h \ - src/ui/map3D/QGCGoogleEarthView.h\ src/ui/SlugsDataSensorView.h \ src/ui/SlugsHilSim.h \ src/ui/SlugsPIDControl.h \ @@ -255,6 +254,11 @@ HEADERS += src/MG.h \ src/comm/MAVLinkSwarmSimulationLink.h \ src/ui/uas/QGCUnconnectedInfoWidget.h +# Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler +macx|win32-msvc2008: { + HEADERS += src/ui/map3D/QGCGoogleEarthView.h +} + contains(DEPENDENCIES_PRESENT, osg) { message("Including headers for OpenSceneGraph") @@ -357,7 +361,6 @@ SOURCES += src/main.cc \ src/ui/RadioCalibration/AbstractCalibrator.cc \ src/ui/RadioCalibration/RadioCalibrationData.cc \ src/ui/QGCWebView.cc \ - src/ui/map3D/QGCGoogleEarthView.cc \ src/ui/map3D/QGCWebPage.cc \ src/ui/SlugsDataSensorView.cc \ src/ui/SlugsHilSim.cc \ @@ -367,6 +370,11 @@ SOURCES += src/main.cc \ src/ui/QGCMainWindowAPConfigurator.cc \ src/comm/MAVLinkSwarmSimulationLink.cc \ src/ui/uas/QGCUnconnectedInfoWidget.cc + +macx|win32-msvc2008: { + SOURCES += src/ui/map3D/QGCGoogleEarthView.cc +} + contains(DEPENDENCIES_PRESENT, osg) { message("Including sources for OpenSceneGraph") diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index 01c6fe175..cb69f3d7c 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -63,7 +63,9 @@ This file is part of the QGROUNDCONTROL project #include "HSIDisplay.h" #include "QGCDataPlot2D.h" #include "QGCRemoteControlView.h" +#if (defined Q_OS_MAC) | (defined _MSC_VER) #include "QGCGoogleEarthView.h" +#endif //#include "QMap3DWidget.h" #include "SlugsDataSensorView.h" #include "LogCompressor.h" -- 2.22.0