From b85b9a21cac0d9888bb9e949ecee7a6fbd0ea62a Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 29 Dec 2014 07:48:43 -0800 Subject: [PATCH] Disable Google Earth Adding Issue #1157 to put back --- QGCExternalLibs.pri | 62 ++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index aa9bd9914..dcda60c9a 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -166,36 +166,40 @@ OSGDependency { # [OPTIONAL] Google Earth dependency. Provides Google Earth view to supplement 2D map view. # 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 from command line)") - DEFINES -= DISABLE_GOOGLE_EARTH -} -# Otherwise the user can still disable this feature in the user_config.pri file. -else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_GOOGLE_EARTH) { - message("Skipping support for Google Earth view (manual override from user_config.pri)") -} else:MacBuild { - message("Including support for Google Earth view") - DEFINES += QGC_GOOGLE_EARTH_ENABLED - HEADERS += src/ui/map3D/QGCGoogleEarthView.h \ - src/ui/map3D/QGCWebPage.h \ - src/ui/QGCWebView.h - SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \ - src/ui/map3D/QGCWebPage.cc \ - src/ui/QGCWebView.cc - FORMS += src/ui/QGCWebView.ui -} else:WindowsBuild { - message("Including support for Google Earth view") - DEFINES += QGC_GOOGLE_EARTH_ENABLED - HEADERS += src/ui/map3D/QGCGoogleEarthView.h \ - src/ui/map3D/QGCWebPage.h \ - src/ui/QGCWebView.h - SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \ - src/ui/map3D/QGCWebPage.cc \ - src/ui/QGCWebView.cc - FORMS += src/ui/QGCWebView.ui - QT += axcontainer +GoogleEarthDisableOverride { + contains(DEFINES, DISABLE_GOOGLE_EARTH) { + message("Skipping support for Google Earth view (manual override from command line)") + DEFINES -= DISABLE_GOOGLE_EARTH + } + # Otherwise the user can still disable this feature in the user_config.pri file. + else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_GOOGLE_EARTH) { + message("Skipping support for Google Earth view (manual override from user_config.pri)") + } else:MacBuild { + message("Including support for Google Earth view") + DEFINES += QGC_GOOGLE_EARTH_ENABLED + HEADERS += src/ui/map3D/QGCGoogleEarthView.h \ + src/ui/map3D/QGCWebPage.h \ + src/ui/QGCWebView.h + SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \ + src/ui/map3D/QGCWebPage.cc \ + src/ui/QGCWebView.cc + FORMS += src/ui/QGCWebView.ui + } else:WindowsBuild { + message("Including support for Google Earth view") + DEFINES += QGC_GOOGLE_EARTH_ENABLED + HEADERS += src/ui/map3D/QGCGoogleEarthView.h \ + src/ui/map3D/QGCWebPage.h \ + src/ui/QGCWebView.h + SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \ + src/ui/map3D/QGCWebPage.cc \ + src/ui/QGCWebView.cc + FORMS += src/ui/QGCWebView.ui + QT += axcontainer + } else { + message("Skipping support for Google Earth view (unsupported platform)") + } } else { - message("Skipping support for Google Earth view (unsupported platform)") + message("Skipping support for Google Earth due to Issue 1157") } # -- 2.22.0