Browse Source

Working on 3D view with google maps

QGC4.4
pixhawk 14 years ago
parent
commit
6dd121cf75
  1. 6
      src/ui/map3D/QGCGoogleEarthView.h

6
src/ui/map3D/QGCGoogleEarthView.h

@ -9,7 +9,7 @@
#include <QWebView> #include <QWebView>
#endif #endif
#if (defined Q_OS_WIN) && !(defined __MINGW32__) #if (defined Q_OS_WIN) & (defined _MSVC_VER)
QGCWebAxWidget* webViewWin; QGCWebAxWidget* webViewWin;
#include <ActiveQt/QAxWidget> #include <ActiveQt/QAxWidget>
#include "windows.h" #include "windows.h"
@ -35,7 +35,7 @@ protected:
#else #else
namespace Ui { namespace Ui {
class QGCGoogleEarthControls; class QGCGoogleEarthControls;
#if (defined Q_OS_WIN) && !(defined __MINGW32__) #if (defined Q_OS_WIN) & (defined _MSVC_VER)
class QGCGoogleEarthViewWin; class QGCGoogleEarthViewWin;
#else #else
class QGCGoogleEarthView; class QGCGoogleEarthView;
@ -69,7 +69,7 @@ protected:
UASInterface* mav; UASInterface* mav;
bool followCamera; bool followCamera;
bool trailEnabled; bool trailEnabled;
#if (defined Q_OS_WIN) && !(defined __MINGW32__) #if (defined Q_OS_WIN) & (defined _MSVC_VER)
WebAxWidget* webViewWin; WebAxWidget* webViewWin;
#endif #endif
#if (defined Q_OS_MAC) #if (defined Q_OS_MAC)

Loading…
Cancel
Save