Merge branch 'master' of github.com:mavlink/qgroundcontrol

f9a43531 · Lorenz Meier · 160e0014 · b0103c8f · f9a43531
Commit f9a43531 authored Sep 24, 2012 by Lorenz Meier
Show whitespace changes
Inline Side-by-side

Showing with 753 additions and 753 deletions

QGCGoogleEarthView.cc src/ui/map3D/QGCGoogleEarthView.cc +753 -753

No files found.
--- a/src/ui/map3D/QGCGoogleEarthView.cc
+++ b/src/ui/map3D/QGCGoogleEarthView.cc
@@ -412,7 +412,7 @@ void QGCGoogleEarthView::showEvent(QShowEvent* event)

 #ifdef _MSC_VER
        //webViewWin->dynamicCall("GoHome()");
-        webViewWin->dynamicCall("Navigate(const QString&)", QApplication::applicationDirPath() + "/earth.html");
+        webViewWin->dynamicCall("Navigate(const QString&)", QApplication::applicationDirPath() + "/files/images/earth.html");
 #endif

        webViewInitialized = true;