From 9833de839e2a359b793b4676f99e3d595a38cc2a Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sun, 30 Nov 2014 19:30:24 -0800
Subject: [PATCH] Fix DISABLE_GOOGLE_EARTH

---
 QGCExternalLibs.pri | 18 ++++++++++++++----
 qgroundcontrol.pro  | 12 +++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index 8b7edd40f..c496c613c 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -176,13 +176,23 @@ else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_GOOGLE_EAR
 } else:MacBuild {
     message("Including support for Google Earth view")
     DEFINES += QGC_GOOGLE_EARTH_ENABLED
-    HEADERS += src/ui/map3D/QGCGoogleEarthView.h
-    SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
+    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
-    SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
+    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)")
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index cd61aa08b..ce3e262fb 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -105,16 +105,19 @@ QT += network \
     opengl \
     svg \
     xml \
-    webkit \
     concurrent \
     widgets \
     gui \
     serialport \
     sql \
     printsupport \
-    webkitwidgets \
     quick
 
+!contains(DEFINES, DISABLE_GOOGLE_EARTH) {
+    QT += webkit webkitwidgets
+}
+
+
 #  testlib is needed even in release flavor for QSignalSpy support
 QT += testlib
 
@@ -273,7 +276,6 @@ FORMS += \
     src/ui/QGCSensorSettingsWidget.ui \
     src/ui/QGCDataPlot2D.ui \
     src/ui/QMap3D.ui \
-    src/ui/QGCWebView.ui \
     src/ui/map3D/QGCGoogleEarthView.ui \
     src/ui/uas/QGCUnconnectedInfoWidget.ui \
     src/ui/designer/QGCToolWidget.ui \
@@ -382,8 +384,6 @@ HEADERS += \
     src/ui/QGCDataPlot2D.h \
     src/ui/linechart/IncrementalPlot.h \
     src/comm/QGCMAVLink.h \
-    src/ui/QGCWebView.h \
-    src/ui/map3D/QGCWebPage.h \
     src/ui/QGCMainWindowAPConfigurator.h \
     src/comm/MAVLinkSwarmSimulationLink.h \
     src/ui/uas/QGCUnconnectedInfoWidget.h \
@@ -526,8 +526,6 @@ SOURCES += \
     src/QGC.cc \
     src/ui/QGCDataPlot2D.cc \
     src/ui/linechart/IncrementalPlot.cc \
-    src/ui/QGCWebView.cc \
-    src/ui/map3D/QGCWebPage.cc \
     src/ui/QGCMainWindowAPConfigurator.cc \
     src/comm/MAVLinkSwarmSimulationLink.cc \
     src/ui/uas/QGCUnconnectedInfoWidget.cc \
-- 
2.22.0