Merge branch 'dev' of pixhawk.ethz.ch:qgroundcontrol into dev

2ccad47c · hengli · 7e98c607 · 40bd5bd8 · 2ccad47c · 2ccad47c
Commit 2ccad47c authored Dec 03, 2010 by hengli
16 changed files
--- a/images/earth.html
+++ b/images/earth.html
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <head>
+<!--
+Copyright 2008 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+    <title>QGroundControl Google Earth View</title>
+    <!-- *** Replace the key below below with your own API key, available at http://code.google.com/apis/maps/signup.html *** -->
+    <script  type="text/javascript" src="http://www.google.com/jsapi?key=ABQIAAAAwbkbZLyhsmTCWXbTcjbgbRSzHs7K5SvaUdm8ua-Xxy_-2dYwMxQMhnagaawTo7L1FE1-amhuQxIlXw"></script>
+    <script  type="text/javascript">
+google.load("earth", "1");
+
+var ge = null;
+
+function init() {
+  google.earth.createInstance("map3d", initCallback, failureCallback);
+}
+
+function initCallback(object) {
+  ge = object;
+  ge.getWindow().setVisibility(true);
+          ge.getOptions().setStatusBarVisibility(true); 
+        ge.getOptions().setScaleLegendVisibility(true);
+        ge.getOptions().setFlyToSpeed(ge.SPEED_TELEPORT); 
+        ge.getNavigationControl().setVisibility(ge.VISIBILITY_AUTO);
+        
+        ge.getLayerRoot().enableLayerById(ge.LAYER_TERRAIN, true); 
+        ge.getLayerRoot().enableLayerById(ge.LAYER_BUILDINGS, true); 
+        ge.getLayerRoot().enableLayerById(ge.LAYER_BORDERS, true); 
+        ge.getLayerRoot().enableLayerById(ge.LAYER_TREES, true);
+}
+
+function failureCallback(object) {
+}
+    </script>
+    <style type="text/css">
+    html, body {
+      margin: 0;
+      width: 100%;
+      height: 100%;
+    }
+    </style>
+  </head>
+  <body onload='init()' id='body'>
+    <center>
+      <div id='map3d' style='margin: 0; spacing: 0; height: 100%; width: 100%'></div>
+    </center>
+  </body>
+</html>
--- a/mavground.qrc
+++ b/mavground.qrc
@@ -82,6 +82,7 @@
        <file>images/mapproviders/openstreetmap.png</file>
        <file>images/mapproviders/google.png</file>
        <file>images/mapproviders/yahoo.png</file>
+        <file>images/earth.html</file>
    </qresource>
    <qresource prefix="/general">
        <file alias="vera.ttf">images/Vera.ttf</file>

--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
-#-------------------------------------------------
-#
-# QGroundControl - Micro Air Vehicle Groundstation
-#
-# Please see our website at <http://qgroundcontrol.org>
-#
-# Author:
-# Lorenz Meier <mavteam@student.ethz.ch>
-#
-# (c) 2009-2010 PIXHAWK Team
-#
-# This file is part of the mav groundstation project
-# QGroundControl is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# QGroundControl is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with QGroundControl. If not, see <http://www.gnu.org/licenses/>.
-#
-#-------------------------------------------------
-
-#$$BASEDIR/lib/qextserialport/include
-#               $$BASEDIR/lib/openjaus/libjaus/include \
-#               $$BASEDIR/lib/openjaus/libopenJaus/include
-
-message(Qt version $$[QT_VERSION])
-
-release {
-#    DEFINES += QT_NO_DEBUG_OUTPUT
-#    DEFINES += QT_NO_WARNING_OUTPUT
-}
-
-QMAKE_PRE_LINK += echo "Copying files"
-
-#QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/.
-#QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release/.
-
-# MAC OS X
-macx { 
-
-    COMPILER_VERSION = $$system(gcc -v)
-    message(Using compiler $$COMPILER_VERSION)
-
-    HARDWARE_PLATFORM = $$system(uname -a)
-    contains( HARDWARE_PLATFORM, 9.6.0 ) || contains( HARDWARE_PLATFORM, 9.7.0 ) || contains( HARDWARE_PLATFORM, 9.8.0 ) || contains( HARDWARE_PLATFORM, 9.9.0 ) {
-        # x86 Mac OS X Leopard 10.5 and earlier
-        CONFIG += x86 cocoa phonon
-        message(Building for Mac OS X 32bit/Leopard 10.5 and earlier)
-
-                # Enable function-profiling with the OS X saturn tool
-                debug {
-                        #QMAKE_CXXFLAGS += -finstrument-functions
-                        #LIBS += -lSaturn
-                }
-    } else {
-        # x64 Mac OS X Snow Leopard 10.6 and later
-        CONFIG += x86_64 cocoa
-        CONFIG -= x86 phonon
-        message(Building for Mac OS X 64bit/Snow Leopard 10.6 and later)
-    }
-
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
-
-    DESTDIR = $$BASEDIR/bin/mac
-    INCLUDEPATH += -framework SDL
-
-    LIBS += -framework IOKit \
-        -framework SDL \
-        -framework CoreFoundation \
-        -framework ApplicationServices \
-        -lm
-    
-    ICON = $$BASEDIR/images/icons/macx.icns
-
-    # Copy audio files if needed
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/qgroundcontrol.app/Contents/MacOs/.
-
-    exists(/Library/Frameworks/osg.framework):exists(/Library/Frameworks/OpenThreads.framework) {
-    # No check for GLUT.framework since it's a MAC default
-    message("Building support for OpenSceneGraph")
-    DEPENDENCIES_PRESENT += osg
-    DEFINES += QGC_OSG_ENABLED
-    # Include OpenSceneGraph libraries
-    INCLUDEPATH += -framework GLUT \
-            -framework Carbon \
-            -framework OpenThreads \
-            -framework osg \
-            -framework osgViewer \
-            -framework osgGA \
-            -framework osgDB \
-            -framework osgText \
-            -framework osgWidget
-
-    LIBS += -framework GLUT \
-            -framework Carbon \
-            -framework OpenThreads \
-            -framework osg \
-            -framework osgViewer \
-            -framework osgGA \
-            -framework osgDB \
-            -framework osgText \
-            -framework osgWidget
-    }
-
-    exists(/usr/include/osgEarth) {
-    message("Building support for osgEarth")
-    DEPENDENCIES_PRESENT += osgearth
-    # Include osgEarth libraries
-    INCLUDEPATH += -framework GDAL \
-            $$IN_PWD/lib/mac32-gcc/include \
-            -framework GEOS \
-            -framework SQLite3 \
-            -framework osgFX \
-            -framework osgTerrain
-
-    LIBS += -framework GDAL \
-            -framework GEOS \
-            -framework SQLite3 \
-            -framework osgFX \
-            -framework osgTerrain \
-    DEFINES += QGC_OSGEARTH_ENABLED
-    }
-
-    exists(/opt/local/include/libfreenect) {
-    message("Building support for libfreenect")
-    DEPENDENCIES_PRESENT += libfreenect
-    # Include libfreenect libraries
-    LIBS += -lfreenect
-    DEFINES += QGC_LIBFREENECT_ENABLED
-    }
-
-    # osg/osgEarth dynamic casts might fail without this compiler option.
-    # see http://osgearth.org/wiki/FAQ for details.
-    #QMAKE_CXXFLAGS += -Wl,-E
-}
-
-# GNU/Linux
-linux-g++ {
-
-    debug {
-        DESTDIR = $$BUILDDIR/debug
-        CONFIG += debug
-    }
-
-    release {
-        DESTDIR = $$BUILDDIR/release
-    }
-
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
-
-    INCLUDEPATH += /usr/include \
-                   /usr/include/qt4/phonon
-              # $$BASEDIR/lib/flite/include \
-              # $$BASEDIR/lib/flite/lang
-
-
-    message(Building for GNU/Linux 32bit/i386)
-
-    LIBS += \
-        -L/usr/lib \
-        -lm \
-        -lflite_cmu_us_kal \
-        -lflite_usenglish \
-        -lflite_cmulex \
-        -lflite \
-        -lSDL \
-        -lSDLmain
-
-    exists(/usr/include/osg) {
-    message("Building support for OpenSceneGraph")
-    DEPENDENCIES_PRESENT += osg
-    # Include OpenSceneGraph libraries
-    LIBS += -losg
-    DEFINES += QGC_OSG_ENABLED
-    }
-
-    exists(/usr/include/osgEarth) | exists(/usr/local/include/osgEarth) {
-    message("Building support for osgEarth")
-    DEPENDENCIES_PRESENT += osgearth
-    # Include osgEarth libraries
-    LIBS += -losgViewer \
-            -losgEarth \
-            -losgEarthUtil
-    DEFINES += QGC_OSGEARTH_ENABLED
-    }
-
-    exists(/usr/local/include/libfreenect/libfreenect.h) {
-    message("Building support for libfreenect")
-    DEPENDENCIES_PRESENT += libfreenect
-    INCLUDEPATH += /usr/include/libusb-1.0
-    # Include libfreenect libraries
-    LIBS += -lfreenect
-    DEFINES += QGC_LIBFREENECT_ENABLED
-    }
-
-    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/.
-    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release/.
-    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/debug/.
-    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/release/.
-
-    # osg/osgEarth dynamic casts might fail without this compiler option.
-    # see http://osgearth.org/wiki/FAQ for details.
-    QMAKE_CXXFLAGS += -Wl,-E
-}
-
-linux-g++-64 {
-
-    debug {
-        DESTDIR = $$BUILDDIR/debug
-        CONFIG += debug
-    }
-
-    release {
-        DESTDIR = $$BUILDDIR/release
-    }
-
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
-
-    INCLUDEPATH += /usr/include \
-                   /usr/include/qt4/phonon
-              # $$BASEDIR/lib/flite/include \
-              # $$BASEDIR/lib/flite/lang
-
-
-    # 64-bit Linux
-    message(Building for GNU/Linux 64bit/x64 (g++-64))
-
-    LIBS += \
-        -L/usr/lib \
-        -lm \
-        -lflite_cmu_us_kal \
-        -lflite_usenglish \
-        -lflite_cmulex \
-        -lflite \
-        -lSDL \
-        -lSDLmain
-
-    exists(/usr/include/osg) {
-    message("Building support for OpenSceneGraph")
-    DEPENDENCIES_PRESENT += osg
-    # Include OpenSceneGraph libraries
-    LIBS += -losg
-    DEFINES += QGC_OSG_ENABLED
-    }
-
-    exists(/usr/include/osgEarth) {
-    message("Building support for osgEarth")
-    DEPENDENCIES_PRESENT += osgearth
-    # Include osgEarth libraries
-    LIBS += -losgViewer \
-            -losgEarth \
-            -losgEarthUtil
-    DEFINES += QGC_OSGEARTH_ENABLED
-    }
-
-    exists(/usr/local/include/libfreenect) {
-    message("Building support for libfreenect")
-    DEPENDENCIES_PRESENT += libfreenect
-    INCLUDEPATH += /usr/include/libusb-1.0
-    # Include libfreenect libraries
-    LIBS += -lfreenect
-    DEFINES += QGC_LIBFREENECT_ENABLED
-    }
-
-    # osg/osgEarth dynamic casts might fail without this compiler option.
-    # see http://osgearth.org/wiki/FAQ for details.
-    QMAKE_CXXFLAGS += -Wl,-E
-}
-
-# Windows (32bit)
-win32-msvc2008 {
-
-    message(Building for Windows Visual Studio 2008 (32bit))
-
-    # Special settings for debug
-    #CONFIG += CONSOLE
-
-    INCLUDEPATH += $$BASEDIR/lib/sdl/msvc/include \
-                   $$BASEDIR/lib/opal/include \
-                   $$BASEDIR/lib/msinttypes
-                   #"C:\Program Files\Microsoft SDKs\Windows\v7.0\Include"
-
-    LIBS += -L$$BASEDIR/lib/sdl/msvc/lib \
-             -lSDLmain -lSDL
-
-    RC_FILE = $$BASEDIR/qgroundcontrol.rc
-
-    # Copy dependencies
-    QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/release/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/release/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/models $$TARGETDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/models $$TARGETDIR/release/.
-
-    # osg/osgEarth dynamic casts might fail without this compiler option.
-    # see http://osgearth.org/wiki/FAQ for details.
-    QMAKE_CXXFLAGS += /Wl /E
-}
-
-# Windows (32bit)
-win32-g++ {
-
-    message(Building for Windows Platform (32bit))
-    
-    # Special settings for debug
-    #CONFIG += CONSOLE
-
-    INCLUDEPATH += $$BASEDIR/lib/sdl/include \
-                   $$BASEDIR/lib/opal/include #\ #\
-                   #"C:\Program Files\Microsoft SDKs\Windows\v7.0\Include"
-
-    LIBS += -L$$BASEDIR/lib/sdl/win32 \
-             -lmingw32 -lSDLmain -lSDL -mwindows
-
-
-
-    debug {
-        DESTDIR = $$BUILDDIR/debug
-    }
-
-    release {
-        DESTDIR = $$BUILDDIR/release
-    }
-        
-    RC_FILE = $$BASEDIR/qgroundcontrol.rc
-
-    # Copy dependencies
-    QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/release/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/release/.
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/models $$TARGETDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/models $$TARGETDIR/release/.
-
-    # osg/osgEarth dynamic casts might fail without this compiler option.
-    # see http://osgearth.org/wiki/FAQ for details.
-    QMAKE_CXXFLAGS += -Wl,-E
-}
-
-# Windows (64bit)
-win64-g++ {
-
-    message(Building for Windows Platform (64bit))
-
-    # Special settings for debug
-    #CONFIG += CONSOLE
-
-    INCLUDEPATH += $$BASEDIR\lib\sdl\include \
-                   $$BASEDIR\lib\opal\include #\ #\
-                   #"C:\Program Files\Microsoft SDKs\Windows\v7.0\Include"
-
-    LIBS += -L$$BASEDIR\lib\sdl\win32 \
-             -lmingw32 -lSDLmain -lSDL -mwindows
-
-
-
-    debug {
-        DESTDIR = $$BASEDIR/bin
-    }
-
-    release {
-        DESTDIR = $$BASEDIR/bin
-    }
-
-    RC_FILE = $$BASEDIR/qgroundcontrol.rc
-
-    # Copy dependencies
-    QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/release/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$BUILDDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$BUILDDIR/release/.
-
-    # osg/osgEarth dynamic casts might fail without this compiler option.
-    # see http://osgearth.org/wiki/FAQ for details.
-    QMAKE_CXXFLAGS += -Wl,-E
-}
+#-------------------------------------------------
+#
+# QGroundControl - Micro Air Vehicle Groundstation
+#
+# Please see our website at <http://qgroundcontrol.org>
+#
+# Author:
+# Lorenz Meier <mavteam@student.ethz.ch>
+#
+# (c) 2009-2010 PIXHAWK Team
+#
+# This file is part of the mav groundstation project
+# QGroundControl is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# QGroundControl is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with QGroundControl. If not, see <http://www.gnu.org/licenses/>.
+#
+#-------------------------------------------------
+
+#$$BASEDIR/lib/qextserialport/include
+#               $$BASEDIR/lib/openjaus/libjaus/include \
+#               $$BASEDIR/lib/openjaus/libopenJaus/include
+
+message(Qt version $$[QT_VERSION])
+
+release {
+#    DEFINES += QT_NO_DEBUG_OUTPUT
+#    DEFINES += QT_NO_WARNING_OUTPUT
+}
+
+QMAKE_PRE_LINK += echo "Copying files"
+
+#QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/.
+#QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release/.
+
+# MAC OS X
+macx { 
+
+    COMPILER_VERSION = system(gcc -v)
+    message(Using compiler $$COMPILER_VERSION)
+
+    HARDWARE_PLATFORM = $$system(uname -a)
+    contains( HARDWARE_PLATFORM, 9.6.0 ) || contains( HARDWARE_PLATFORM, 9.7.0 ) || contains( HARDWARE_PLATFORM, 9.8.0 ) || contains( HARDWARE_PLATFORM, 9.9.0 ) {
+        # x86 Mac OS X Leopard 10.5 and earlier
+        CONFIG += x86 cocoa phonon
+        message(Building for Mac OS X 32bit/Leopard 10.5 and earlier)
+
+                # Enable function-profiling with the OS X saturn tool
+                debug {
+                        #QMAKE_CXXFLAGS += -finstrument-functions
+                        #LIBS += -lSaturn
+                }
+    } else {
+        # x64 Mac OS X Snow Leopard 10.6 and later
+        CONFIG += x86_64 cocoa
+        CONFIG -= x86 phonon
+        message(Building for Mac OS X 64bit/Snow Leopard 10.6 and later)
+    }
+
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+
+    DESTDIR = $$BASEDIR/bin/mac
+    INCLUDEPATH += -framework SDL
+
+    LIBS += -framework IOKit \
+        -framework SDL \
+        -framework CoreFoundation \
+        -framework ApplicationServices \
+        -lm
+    
+    ICON = $$BASEDIR/images/icons/macx.icns
+
+    # Copy audio files if needed
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/audio $$DESTDIR/qgroundcontrol.app/Contents/MacOs/.
+    # Copy google earth starter file
+    QMAKE_PRE_LINK += && cp -f $$BASEDIR/images/earth.html $$DESTDIR/qgroundcontrol.app/Contents/MacOs/.
+
+    exists(/Library/Frameworks/osg.framework):exists(/Library/Frameworks/OpenThreads.framework) {
+    # No check for GLUT.framework since it's a MAC default
+    message("Building support for OpenSceneGraph")
+    DEPENDENCIES_PRESENT += osg
+    DEFINES += QGC_OSG_ENABLED
+    # Include OpenSceneGraph libraries
+    INCLUDEPATH += -framework GLUT \
+            -framework Carbon \
+            -framework OpenThreads \
+            -framework osg \
+            -framework osgViewer \
+            -framework osgGA \
+            -framework osgDB \
+            -framework osgText \
+            -framework osgWidget
+
+    LIBS += -framework GLUT \
+            -framework Carbon \
+            -framework OpenThreads \
+            -framework osg \
+            -framework osgViewer \
+            -framework osgGA \
+            -framework osgDB \
+            -framework osgText \
+            -framework osgWidget
+    }
+
+    exists(/usr/include/osgEarth) {
+    message("Building support for osgEarth")
+    DEPENDENCIES_PRESENT += osgearth
+    # Include osgEarth libraries
+    INCLUDEPATH += -framework GDAL \
+            $$IN_PWD/lib/mac32-gcc/include \
+            -framework GEOS \
+            -framework SQLite3 \
+            -framework osgFX \
+            -framework osgTerrain
+
+    LIBS += -framework GDAL \
+            -framework GEOS \
+            -framework SQLite3 \
+            -framework osgFX \
+            -framework osgTerrain \
+    DEFINES += QGC_OSGEARTH_ENABLED
+    }
+
+    exists(/opt/local/include/libfreenect) {
+    message("Building support for libfreenect")
+    DEPENDENCIES_PRESENT += libfreenect
+    # Include libfreenect libraries
+    LIBS += -lfreenect
+    DEFINES += QGC_LIBFREENECT_ENABLED
+    }
+
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+    #QMAKE_CXXFLAGS += -Wl,-E
+}
+
+# GNU/Linux
+linux-g++ {
+
+    debug {
+        DESTDIR = $$BUILDDIR/debug
+        CONFIG += debug
+    }
+
+    release {
+        DESTDIR = $$BUILDDIR/release
+    }
+
+    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
+
+    INCLUDEPATH += /usr/include \
+                   /usr/include/qt4/phonon
+              # $$BASEDIR/lib/flite/include \
+              # $$BASEDIR/lib/flite/lang
+
+
+    message(Building for GNU/Linux 32bit/i386)
+
+    LIBS += \
+        -L/usr/lib \
+        -lm \
+        -lflite_cmu_us_kal \
+        -lflite_usenglish \
+        -lflite_cmulex \
+        -lflite \
+        -lSDL \
+        -lSDLmain
+
+    exists(/usr/include/osg) {
+    message("Building support for OpenSceneGraph")
+    DEPENDENCIES_PRESENT += osg
+    # Include OpenSceneGraph libraries
+    LIBS += -losg
+    DEFINES += QGC_OSG_ENABLED
+    }
+
+    exists(/usr/include/osgEarth) | exists(/usr/local/include/osgEarth) {
+    message("Building support for osgEarth")
+    DEPENDENCIES_PRESENT += osgearth
+    # Include osgEarth libraries
+    LIBS += -losgViewer \
+            -losgEarth \
+            -losgEarthUtil
+    DEFINES += QGC_OSGEARTH_ENABLED
+    }
+
+    exists(/usr/local/include/libfreenect/libfreenect.h) {
+    message("Building support for libfreenect")
+    DEPENDENCIES_PRESENT += libfreenect
+    INCLUDEPATH += /usr/include/libusb-1.0
+    # Include libfreenect libraries
+    LIBS += -lfreenect
+    DEFINES += QGC_LIBFREENECT_ENABLED
+    }
+
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/debug/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR/release/.
+
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+    QMAKE_CXXFLAGS += -Wl,-E
+}
+
+linux-g++-64 {
+
+    debug {
+        DESTDIR = $$BUILDDIR/debug
+        CONFIG += debug
+    }
+
+    release {
+        DESTDIR = $$BUILDDIR/release
+    }
+
+    QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
+
+    INCLUDEPATH += /usr/include \
+                   /usr/include/qt4/phonon
+              # $$BASEDIR/lib/flite/include \
+              # $$BASEDIR/lib/flite/lang
+
+
+    # 64-bit Linux
+    message(Building for GNU/Linux 64bit/x64 (g++-64))
+
+    LIBS += \
+        -L/usr/lib \
+        -lm \
+        -lflite_cmu_us_kal \
+        -lflite_usenglish \
+        -lflite_cmulex \
+        -lflite \
+        -lSDL \
+        -lSDLmain
+
+    exists(/usr/include/osg) {
+    message("Building support for OpenSceneGraph")
+    DEPENDENCIES_PRESENT += osg
+    # Include OpenSceneGraph libraries
+    LIBS += -losg
+    DEFINES += QGC_OSG_ENABLED
+    }
+
+    exists(/usr/include/osgEarth) {
+    message("Building support for osgEarth")
+    DEPENDENCIES_PRESENT += osgearth
+    # Include osgEarth libraries
+    LIBS += -losgViewer \
+            -losgEarth \
+            -losgEarthUtil
+    DEFINES += QGC_OSGEARTH_ENABLED
+    }
+
+    exists(/usr/local/include/libfreenect) {
+    message("Building support for libfreenect")
+    DEPENDENCIES_PRESENT += libfreenect
+    INCLUDEPATH += /usr/include/libusb-1.0
+    # Include libfreenect libraries
+    LIBS += -lfreenect
+    DEFINES += QGC_LIBFREENECT_ENABLED
+    }
+
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+    QMAKE_CXXFLAGS += -Wl,-E
+}
+
+# Windows (32bit)
+win32-msvc2008 {
+
+    message(Building for Windows Visual Studio 2008 (32bit))
+
+    # Special settings for debug
+    #CONFIG += CONSOLE
+
+    INCLUDEPATH += $$BASEDIR/lib/sdl/msvc/include \
+                   $$BASEDIR/lib/opal/include \
+                   $$BASEDIR/lib/msinttypes
+                   #"C:\Program Files\Microsoft SDKs\Windows\v7.0\Include"
+
+    LIBS += -L$$BASEDIR/lib/sdl/msvc/lib \
+             -lSDLmain -lSDL
+
+exists($$BASEDIR/lib/osg123) {
+message("Building support for OSG")
+DEPENDENCIES_PRESENT += osg
+
+# Include OpenSceneGraph and osgEarth libraries
+INCLUDEPATH += $$BASEDIR/lib/osgEarth/win32/include \
+    $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/include
+LIBS += -L$$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/lib \
+    -losg \
+    -losgViewer \
+	-losgGA \
+	-losgDB \
+	-losgText \
+        -lOpenThreads
+DEFINES += QGC_OSG_ENABLED
+exists($$BASEDIR/lib/osgEarth123) {
+    DEPENDENCIES_PRESENT += osgearth
+    message("Building support for osgEarth")
+    DEFINES += QGC_OSGEARTH_ENABLED
+    LIBS += -L$$BASEDIR/lib/osgEarth/win32/lib \
+        -losgEarth \
+        -losgEarthUtil
+}
+}
+
+    RC_FILE = $$BASEDIR/qgroundcontrol.rc
+
+    # Copy dependencies
+    QMAKE_PRE_LINK += && cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/debug/.
+	QMAKE_PRE_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/debug/.
+	
+	
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/osg55-osg.dll $$TARGETDIR/release/. &&
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/osg55-osgViewer.dll $$TARGETDIR/release/. &&
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/osg55-osgGA.dll $$TARGETDIR/release/. &&
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/osg55-osgDB.dll $$TARGETDIR/release/. &&
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/osg55-osgText.dll $$TARGETDIR/release/. &&
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/OpenThreads.dll $$TARGETDIR/release/. &&
+	
+    QMAKE_PRE_LINK += && cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/release/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/release/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release/.
+
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+
+    # Copy google earth starter file
+    QMAKE_PRE_LINK += && cp -f $$BASEDIR/images/earth.html $$TARGETDIR/release/
+    QMAKE_PRE_LINK += && cp -f $$BASEDIR/images/earth.html $$TARGETDIR/debug/
+
+}
+
+# Windows (32bit)
+win32-g++ {
+
+    message(Building for Windows Platform (32bit))
+    
+    # Special settings for debug
+    #CONFIG += CONSOLE
+
+    INCLUDEPATH += $$BASEDIR/lib/sdl/include \
+                   $$BASEDIR/lib/opal/include #\ #\
+                   #"C:\Program Files\Microsoft SDKs\Windows\v7.0\Include"
+
+    LIBS += -L$$BASEDIR/lib/sdl/win32 \
+             -lmingw32 -lSDLmain -lSDL -mwindows
+
+
+
+    debug {
+        DESTDIR = $$BUILDDIR/debug
+    }
+
+    release {
+        DESTDIR = $$BUILDDIR/release
+    }
+        
+    RC_FILE = $$BASEDIR/qgroundcontrol.rc
+
+    # Copy dependencies
+	debug {
+    QMAKE_PRE_LINK += && cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/debug/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/debug/.
+	QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/debug/.
+	}
+	
+	release {
+	QMAKE_PRE_LINK += && cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$BUILDDIR/release/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/audio $$TARGETDIR/release/.
+    QMAKE_PRE_LINK += && cp -rf $$BASEDIR/models $$TARGETDIR/release/.
+	}
+
+    # osg/osgEarth dynamic casts might fail without this compiler option.
+    # see http://osgearth.org/wiki/FAQ for details.
+    QMAKE_CXXFLAGS += -Wl,-E
+}
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -30,7 +30,8 @@ QT += network \
    opengl \
    svg \
    xml \
-    phonon
+    phonon \
+    webkit
 TEMPLATE = app
 TARGET = qgroundcontrol
 BASEDIR = $$IN_PWD
@@ -138,7 +139,9 @@ FORMS += src/ui/MainWindow.ui \
    src/ui/QGCPxImuFirmwareUpdate.ui \
    src/ui/QGCDataPlot2D.ui \
    src/ui/QGCRemoteControlView.ui \
-    src/ui/QMap3D.ui
+    src/ui/QMap3D.ui \
+    src/ui/QGCWebView.ui \
+    src/ui/map3D/QGCGoogleEarthView.ui

 # src/ui/WaypointGlobalView.ui
 INCLUDEPATH += src \
@@ -222,14 +225,18 @@ HEADERS += src/MG.h \
    src/ui/linechart/IncrementalPlot.h \
    src/ui/map/Waypoint2DIcon.h \
    src/ui/map/MAV2DIcon.h \
-    src/ui/QGCRemoteControlView.h \ # src/ui/WaypointGlobalView.h \
+    src/ui/QGCRemoteControlView.h \
    src/ui/RadioCalibration/RadioCalibrationData.h \
    src/ui/RadioCalibration/RadioCalibrationWindow.h \
    src/ui/RadioCalibration/AirfoilServoCalibrator.h \
    src/ui/RadioCalibration/SwitchCalibrator.h \
    src/ui/RadioCalibration/CurveCalibrator.h \
    src/ui/RadioCalibration/AbstractCalibrator.h \
-    src/comm/QGCMAVLink.h
+    src/comm/QGCMAVLink.h \
+    src/ui/QGCWebView.h \
+    src/ui/map3D/QGCGoogleEarthView.h
+
+
 contains(DEPENDENCIES_PRESENT, osg) { 
    message("Including headers for OpenSceneGraph")
    
@@ -327,7 +334,9 @@ SOURCES += src/main.cc \
    src/ui/RadioCalibration/SwitchCalibrator.cc \
    src/ui/RadioCalibration/CurveCalibrator.cc \
    src/ui/RadioCalibration/AbstractCalibrator.cc \
-    src/ui/RadioCalibration/RadioCalibrationData.cc
+    src/ui/RadioCalibration/RadioCalibrationData.cc \
+    src/ui/QGCWebView.cc \
+    src/ui/map3D/QGCGoogleEarthView.cc
 contains(DEPENDENCIES_PRESENT, osg) { 
    message("Including sources for OpenSceneGraph")
    

--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -41,7 +41,7 @@ This file is part of the QGROUNDCONTROL project
 #endif

 // Speech synthesis is only supported with MSVC compiler
-#if _MSC_VER
+#if _MSC_VER2
 // Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx
 #define _ATL_APARTMENT_THREADED

@@ -93,7 +93,7 @@ emergency(false)
    flite_init();
 #endif

-	#if _MSC_VER
+	#if _MSC_VER2

 		ISpVoice * pVoice = NULL;
 	    if (FAILED(::CoInitialize(NULL)))
@@ -134,7 +134,7 @@ emergency(false)

 GAudioOutput::~GAudioOutput()
 {
-#ifdef _MSC_VER
+#ifdef _MSC_VER2
 	::CoUninitialize();
 #endif
 }

--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -142,6 +142,7 @@ void MainWindow::buildWidgets()
 #ifdef QGC_OSGEARTH_ENABLED
    _3DMapWidget = Q3DWidgetFactory::get("MAP3D");
 #endif
+    gEarthWidget = new QGCGoogleEarthView(this);

    // Dock widgets
    controlDockWidget = new QDockWidget(tr("Control"), this);
@@ -239,6 +240,7 @@ void MainWindow::arrangeCenterStack()
    #ifdef QGC_OSGEARTH_ENABLED
    if (_3DMapWidget) centerStack->addWidget(_3DMapWidget);
    #endif
+    if (gEarthWidget) centerStack->addWidget(gEarthWidget);
    if (hudWidget) centerStack->addWidget(hudWidget);
    if (dataplotWidget) centerStack->addWidget(dataplotWidget);

@@ -388,6 +390,7 @@ void MainWindow::connectActions()
    connect(ui.actionOnline_documentation, SIGNAL(triggered()), this, SLOT(showHelp()));
    connect(ui.actionCredits_Developers, SIGNAL(triggered()), this, SLOT(showCredits()));
    connect(ui.actionProject_Roadmap, SIGNAL(triggered()), this, SLOT(showRoadMap()));
+    connect(ui.actionGoogleEarthView, SIGNAL(triggered()), this, SLOT(loadGoogleEarthView()));

    // Joystick configuration
    connect(ui.actionJoystickSettings, SIGNAL(triggered()), this, SLOT(configure()));
@@ -1017,6 +1020,55 @@ void MainWindow::load3DMapView()
            }
 #endif
            this->show();
+        }
+
+void MainWindow::loadGoogleEarthView()
+{
+            clearView();
+
+            // 3D map
+            if (gEarthWidget)
+            {
+                QStackedWidget *centerStack = dynamic_cast<QStackedWidget*>(centralWidget());
+                if (centerStack)
+                {
+                    centerStack->setCurrentWidget(gEarthWidget);
+                }
+            }
+
+            // UAS CONTROL
+            if (controlDockWidget)
+            {
+                addDockWidget(Qt::LeftDockWidgetArea, controlDockWidget);
+                controlDockWidget->show();
+            }
+
+            // UAS LIST
+            if (listDockWidget)
+            {
+                addDockWidget(Qt::BottomDockWidgetArea, listDockWidget);
+                listDockWidget->show();
+            }
+
+            // WAYPOINT LIST
+            if (waypointsDockWidget)
+            {
+                addDockWidget(Qt::BottomDockWidgetArea, waypointsDockWidget);
+                waypointsDockWidget->show();
+            }
+
+            // HORIZONTAL SITUATION INDICATOR
+            if (hsiDockWidget)
+            {
+                HSIDisplay* hsi = dynamic_cast<HSIDisplay*>( hsiDockWidget->widget() );
+                if (hsi)
+                {
+                    hsi->start();
+                    addDockWidget(Qt::LeftDockWidgetArea, hsiDockWidget);
+                    hsiDockWidget->show();
+                }
+            }
+            this->show();

        }


--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -63,7 +63,7 @@ This file is part of the QGROUNDCONTROL project
 #include "HSIDisplay.h"
 #include "QGCDataPlot2D.h"
 #include "QGCRemoteControlView.h"
-
+#include "QGCGoogleEarthView.h"
 #include "LogCompressor.h"


@@ -113,6 +113,8 @@ public slots:
    void loadOperatorView();
    /** @brief Load 3D view */
    void load3DView();
+    /** @brief Load 3D Google Earth view */
+    void loadGoogleEarthView();
    /** @brief Load 3D map view */
    void load3DMapView();
    /** @brief Load view with all widgets */
@@ -170,6 +172,7 @@ protected:
    #ifdef QGC_OSGEARTH_ENABLED
    QPointer<QWidget> _3DMapWidget;
    #endif
+    QPointer<QGCGoogleEarthView> gEarthWidget;
    // Dock widgets
    QPointer<QDockWidget> controlDockWidget;
    QPointer<QDockWidget> infoDockWidget;

--- a/src/ui/MainWindow.ui
+++ b/src/ui/MainWindow.ui
@@ -38,7 +38,7 @@
     <x>0</x>
     <y>0</y>
     <width>1000</width>
-     <height>25</height>
+     <height>22</height>
    </rect>
   </property>
   <widget class="QMenu" name="menuMGround">
@@ -77,6 +77,7 @@
    <addaction name="actionOperatorView"/>
    <addaction name="action3DMapView"/>
    <addaction name="action3DView"/>
+    <addaction name="actionGoogleEarthView"/>
    <addaction name="actionGlobalOperatorView"/>
    <addaction name="separator"/>
    <addaction name="actionShow_MAVLink_view"/>
@@ -235,7 +236,7 @@
     <normaloff>:/images/categories/preferences-system.svg</normaloff>:/images/categories/preferences-system.svg</iconset>
   </property>
   <property name="text">
-    <string>Show 3D local view</string>
+    <string>Show 3D Local View</string>
   </property>
   <property name="toolTip">
    <string>Show 3D view</string>
@@ -316,7 +317,7 @@
     <normaloff>:/images/categories/applications-internet.svg</normaloff>:/images/categories/applications-internet.svg</iconset>
   </property>
   <property name="text">
-    <string>Show Global operator view</string>
+    <string>Show 2D Map View</string>
   </property>
  </action>
  <action name="action3DMapView">
@@ -325,7 +326,16 @@
     <normaloff>:/images/categories/applications-internet.svg</normaloff>:/images/categories/applications-internet.svg</iconset>
   </property>
   <property name="text">
-    <string>Show 3D Globe view</string>
+    <string>Show 3D Global View</string>
+   </property>
+  </action>
+  <action name="actionGoogleEarthView">
+   <property name="icon">
+    <iconset resource="../../mavground.qrc">
+     <normaloff>:/images/mapproviders/google.png</normaloff>:/images/mapproviders/google.png</iconset>
+   </property>
+   <property name="text">
+    <string>Google Earth View</string>
   </property>
  </action>
 </widget>

--- a/src/ui/QGCWebView.cc
+++ b/src/ui/QGCWebView.cc
+#include "QGCWebView.h"
+#include "ui_QGCWebView.h"
+
+QGCWebView::QGCWebView(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::QGCWebView)
+{
+    ui->setupUi(this);
+    ui->webView->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
+    ui->webView->load(QUrl("http://qgroundcontrol.org"));
+}
+
+QGCWebView::~QGCWebView()
+{
+    delete ui;
+}
+
+void QGCWebView::changeEvent(QEvent *e)
+{
+    QWidget::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
--- a/src/ui/QGCWebView.h
+++ b/src/ui/QGCWebView.h
+#ifndef QGCWEBVIEW_H
+#define QGCWEBVIEW_H
+
+#include <QWidget>
+
+namespace Ui {
+    class QGCWebView;
+}
+
+class QGCWebView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit QGCWebView(QWidget *parent = 0);
+    ~QGCWebView();
+
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    Ui::QGCWebView *ui;
+};
+
+#endif // QGCWEBVIEW_H
--- a/src/ui/QGCWebView.ui
+++ b/src/ui/QGCWebView.ui
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QGCWebView</class>
+ <widget class="QWidget" name="QGCWebView">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QWebView" name="webView">
+     <property name="url">
+      <url>
+       <string>about:blank</string>
+      </url>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QWebView</class>
+   <extends>QWidget</extends>
+   <header>QtWebKit/QWebView</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
--- a/src/ui/map3D/Pixhawk3DWidget.cc
+++ b/src/ui/map3D/Pixhawk3DWidget.cc
@@ -488,7 +488,7 @@ Pixhawk3DWidget::createGrid(void)
    // draw a 20m x 20m grid with 0.25m resolution
    for (float i = -radius; i <= radius; i += resolution)
    {
-        if (fabsf(i - roundf(i)) < 0.01f)
+        if (fabsf(i - floor(i + 0.5f)) < 0.01f)
        {
            coarseCoords->push_back(osg::Vec3(i, -radius, 0.0f));
            coarseCoords->push_back(osg::Vec3(i, radius, 0.0f));

--- a/src/ui/map3D/Q3DWidget.h
+++ b/src/ui/map3D/Q3DWidget.h
@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
 #define Q3DWIDGET_H

 #include <QtOpenGL>
-
+#include <inttypes.h>

 #include <osg/LineSegment>
 #include <osg/PositionAttitudeTransform>

--- a/src/ui/map3D/QGCGoogleEarthView.cc
+++ b/src/ui/map3D/QGCGoogleEarthView.cc
+#include "QGCGoogleEarthView.h"
+#include "ui_QGCGoogleEarthView.h"
+
+QGCGoogleEarthView::QGCGoogleEarthView(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::QGCGoogleEarthView)
+{
+    ui->setupUi(this);
+    ui->webView->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
+    ui->webView->load(QUrl("earth.html"));
+}
+
+QGCGoogleEarthView::~QGCGoogleEarthView()
+{
+    delete ui;
+}
+
+void QGCGoogleEarthView::changeEvent(QEvent *e)
+{
+    QWidget::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
--- a/src/ui/map3D/QGCGoogleEarthView.h
+++ b/src/ui/map3D/QGCGoogleEarthView.h
+#ifndef QGCGOOGLEEARTHVIEW_H
+#define QGCGOOGLEEARTHVIEW_H
+
+#include <QWidget>
+
+namespace Ui {
+    class QGCGoogleEarthView;
+}
+
+class QGCGoogleEarthView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit QGCGoogleEarthView(QWidget *parent = 0);
+    ~QGCGoogleEarthView();
+
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    Ui::QGCGoogleEarthView *ui;
+};
+
+#endif // QGCGOOGLEEARTHVIEW_H
--- a/src/ui/map3D/QGCGoogleEarthView.ui
+++ b/src/ui/map3D/QGCGoogleEarthView.ui
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QGCGoogleEarthView</class>
+ <widget class="QWidget" name="QGCGoogleEarthView">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QWebView" name="webView">
+     <property name="url">
+      <url>
+       <string>about:blank</string>
+      </url>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QWebView</class>
+   <extends>QWidget</extends>
+   <header>QtWebKit/QWebView</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>