Skip to content

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

Fix DISABLE_GOOGLE_EARTH

parent c9274137
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 11 deletions
QGCExternalLibs.pri
View file @ 9833de83
...@@ -176,13 +176,23 @@ else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_GOOGLE_EAR ...@@ -176,13 +176,23 @@ else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_GOOGLE_EAR
} else:MacBuild { } else:MacBuild {
message("Including support for Google Earth view") message("Including support for Google Earth view")
DEFINES += QGC_GOOGLE_EARTH_ENABLED DEFINES += QGC_GOOGLE_EARTH_ENABLED
HEADERS += src/ui/map3D/QGCGoogleEarthView.h HEADERS += src/ui/map3D/QGCGoogleEarthView.h \
SOURCES += src/ui/map3D/QGCGoogleEarthView.cc 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 { } else:WindowsBuild {
message("Including support for Google Earth view") message("Including support for Google Earth view")
DEFINES += QGC_GOOGLE_EARTH_ENABLED DEFINES += QGC_GOOGLE_EARTH_ENABLED
HEADERS += src/ui/map3D/QGCGoogleEarthView.h HEADERS += src/ui/map3D/QGCGoogleEarthView.h \
SOURCES += src/ui/map3D/QGCGoogleEarthView.cc 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 QT += axcontainer
} else { } else {
message("Skipping support for Google Earth view (unsupported platform)") message("Skipping support for Google Earth view (unsupported platform)")
......
qgroundcontrol.pro
View file @ 9833de83
...@@ -105,16 +105,19 @@ QT += network \ ...@@ -105,16 +105,19 @@ QT += network \
opengl \ opengl \
svg \ svg \
xml \ xml \
webkit \
concurrent \ concurrent \
widgets \ widgets \
gui \ gui \
serialport \ serialport \
sql \ sql \
printsupport \ printsupport \
webkitwidgets \
quick quick
!contains(DEFINES, DISABLE_GOOGLE_EARTH) {
QT += webkit webkitwidgets
}
# testlib is needed even in release flavor for QSignalSpy support # testlib is needed even in release flavor for QSignalSpy support
QT += testlib QT += testlib
...@@ -273,7 +276,6 @@ FORMS += \ ...@@ -273,7 +276,6 @@ FORMS += \
src/ui/QGCSensorSettingsWidget.ui \ src/ui/QGCSensorSettingsWidget.ui \
src/ui/QGCDataPlot2D.ui \ src/ui/QGCDataPlot2D.ui \
src/ui/QMap3D.ui \ src/ui/QMap3D.ui \
src/ui/QGCWebView.ui \
src/ui/map3D/QGCGoogleEarthView.ui \ src/ui/map3D/QGCGoogleEarthView.ui \
src/ui/uas/QGCUnconnectedInfoWidget.ui \ src/ui/uas/QGCUnconnectedInfoWidget.ui \
src/ui/designer/QGCToolWidget.ui \ src/ui/designer/QGCToolWidget.ui \
...@@ -382,8 +384,6 @@ HEADERS += \ ...@@ -382,8 +384,6 @@ HEADERS += \
src/ui/QGCDataPlot2D.h \ src/ui/QGCDataPlot2D.h \
src/ui/linechart/IncrementalPlot.h \ src/ui/linechart/IncrementalPlot.h \
src/comm/QGCMAVLink.h \ src/comm/QGCMAVLink.h \
src/ui/QGCWebView.h \
src/ui/map3D/QGCWebPage.h \
src/ui/QGCMainWindowAPConfigurator.h \ src/ui/QGCMainWindowAPConfigurator.h \
src/comm/MAVLinkSwarmSimulationLink.h \ src/comm/MAVLinkSwarmSimulationLink.h \
src/ui/uas/QGCUnconnectedInfoWidget.h \ src/ui/uas/QGCUnconnectedInfoWidget.h \
...@@ -526,8 +526,6 @@ SOURCES += \ ...@@ -526,8 +526,6 @@ SOURCES += \
src/QGC.cc \ src/QGC.cc \
src/ui/QGCDataPlot2D.cc \ src/ui/QGCDataPlot2D.cc \
src/ui/linechart/IncrementalPlot.cc \ src/ui/linechart/IncrementalPlot.cc \
src/ui/QGCWebView.cc \
src/ui/map3D/QGCWebPage.cc \
src/ui/QGCMainWindowAPConfigurator.cc \ src/ui/QGCMainWindowAPConfigurator.cc \
src/comm/MAVLinkSwarmSimulationLink.cc \ src/comm/MAVLinkSwarmSimulationLink.cc \
src/ui/uas/QGCUnconnectedInfoWidget.cc \ src/ui/uas/QGCUnconnectedInfoWidget.cc \
......
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