Fixed window persistence

e53a9d6f · lm · b6250c0c · e53a9d6f · e53a9d6f · e53a9d6f
Commit e53a9d6f authored Dec 21, 2010 by lm
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 49 additions and 219 deletions

qgroundcontrol.pri qgroundcontrol.pri +3 -0

MainWindow.cc src/ui/MainWindow.cc +42 -214

QGCGoogleEarthView.cc src/ui/map3D/QGCGoogleEarthView.cc +4 -5

No files found.
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -290,6 +290,9 @@ win32-msvc2008 {

    CONFIG += qaxcontainer

+    # QWebkit is not needed on MS-Windows compilation environment
+    CONFIG -= webkit
+
    # Special settings for debug
    #CONFIG += CONSOLE


--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
--- a/src/ui/map3D/QGCGoogleEarthView.cc
+++ b/src/ui/map3D/QGCGoogleEarthView.cc
-#include <QWebFrame>
-#include <QWebPage>
 #include <QApplication>
 #include <QDir>

 #include <QDebug>
-
-#include "QGCGoogleEarthView.h"
-#include "QGCWebPage.h"
 #include "UASManager.h"
 #ifdef _MSC_VER
 #include "ui_QGCGoogleEarthView.h"
 #else
+#include <QWebFrame>
+#include <QWebPage>
+#include "QGCWebPage.h"
 #include "ui_QGCGoogleEarthView.h"
 #endif
+#include "QGCGoogleEarthView.h"

 QGCGoogleEarthView::QGCGoogleEarthView(QWidget *parent) :
        QWidget(parent),