Skip to content

Q
qgroundcontrol
Commit b85b9a21 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Disable Google Earth 

Adding Issue #1157 to put back
parent 746ba82d
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 29 deletions
QGCExternalLibs.pri
View file @ b85b9a21
...@@ -166,36 +166,40 @@ OSGDependency { ...@@ -166,36 +166,40 @@ OSGDependency {
# [OPTIONAL] Google Earth dependency. Provides Google Earth view to supplement 2D map view. # [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. # Only supported on Mac and Windows where Google Earth can be installed.
# #
contains(DEFINES, DISABLE_GOOGLE_EARTH) { GoogleEarthDisableOverride {
message("Skipping support for Google Earth view (manual override from command line)") contains(DEFINES, DISABLE_GOOGLE_EARTH) {
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) { # Otherwise the user can still disable this feature in the user_config.pri file.
message("Skipping support for Google Earth view (manual override from user_config.pri)") else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_GOOGLE_EARTH) {
} else:MacBuild { message("Skipping support for Google Earth view (manual override from user_config.pri)")
message("Including support for Google Earth view") } else:MacBuild {
DEFINES += QGC_GOOGLE_EARTH_ENABLED message("Including support for Google Earth view")
HEADERS += src/ui/map3D/QGCGoogleEarthView.h \ DEFINES += QGC_GOOGLE_EARTH_ENABLED
src/ui/map3D/QGCWebPage.h \ HEADERS += src/ui/map3D/QGCGoogleEarthView.h \
src/ui/QGCWebView.h src/ui/map3D/QGCWebPage.h \
SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \ src/ui/QGCWebView.h
src/ui/map3D/QGCWebPage.cc \ SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \
src/ui/QGCWebView.cc src/ui/map3D/QGCWebPage.cc \
FORMS += src/ui/QGCWebView.ui src/ui/QGCWebView.cc
} else:WindowsBuild { FORMS += src/ui/QGCWebView.ui
message("Including support for Google Earth view") } else:WindowsBuild {
DEFINES += QGC_GOOGLE_EARTH_ENABLED message("Including support for Google Earth view")
HEADERS += src/ui/map3D/QGCGoogleEarthView.h \ DEFINES += QGC_GOOGLE_EARTH_ENABLED
src/ui/map3D/QGCWebPage.h \ HEADERS += src/ui/map3D/QGCGoogleEarthView.h \
src/ui/QGCWebView.h src/ui/map3D/QGCWebPage.h \
SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \ src/ui/QGCWebView.h
src/ui/map3D/QGCWebPage.cc \ SOURCES += src/ui/map3D/QGCGoogleEarthView.cc \
src/ui/QGCWebView.cc src/ui/map3D/QGCWebPage.cc \
FORMS += src/ui/QGCWebView.ui src/ui/QGCWebView.cc
QT += axcontainer FORMS += src/ui/QGCWebView.ui
QT += axcontainer
} else {
message("Skipping support for Google Earth view (unsupported platform)")
}
} else { } else {
message("Skipping support for Google Earth view (unsupported platform)") message("Skipping support for Google Earth due to Issue 1157")
} }
# #
......
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