From 881c874ec3aebb7454802de99b4aa3e018cb1919 Mon Sep 17 00:00:00 2001
From: Lionel Heng <hengli@student.ethz.ch>
Date: Mon, 29 Nov 2010 20:41:02 +0100
Subject: [PATCH] Fixed build errors in latest revision.

---
 qgroundcontrol.pri            | 10 +++++-----
 src/ui/map3D/GCManipulator.cc |  2 +-
 src/ui/map3D/Q3DWidget.cc     |  1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index ca97ea05a..8103c9ea9 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -135,7 +135,7 @@ macx {
 
     # osg/osgEarth dynamic casts might fail without this compiler option.
     # see http://osgearth.org/wiki/FAQ for details.
-    #QMAKE_CXXFLAGS += -Wl, -E
+    #QMAKE_CXXFLAGS += -Wl,-E
 }
 
 # GNU/Linux
@@ -204,7 +204,7 @@ linux-g++ {
 
     # osg/osgEarth dynamic casts might fail without this compiler option.
     # see http://osgearth.org/wiki/FAQ for details.
-    QMAKE_CXXFLAGS += -Wl, -E
+    QMAKE_CXXFLAGS += -Wl,-E
 }
 
 linux-g++-64 {
@@ -268,7 +268,7 @@ linux-g++-64 {
 
     # osg/osgEarth dynamic casts might fail without this compiler option.
     # see http://osgearth.org/wiki/FAQ for details.
-    QMAKE_CXXFLAGS += -Wl, -E
+    QMAKE_CXXFLAGS += -Wl,-E
 }
 
 # Windows (32bit)
@@ -339,7 +339,7 @@ win32-g++ {
 
     # osg/osgEarth dynamic casts might fail without this compiler option.
     # see http://osgearth.org/wiki/FAQ for details.
-    QMAKE_CXXFLAGS += -Wl, -E
+    QMAKE_CXXFLAGS += -Wl,-E
 }
 
 # Windows (64bit)
@@ -377,5 +377,5 @@ win64-g++ {
 
     # osg/osgEarth dynamic casts might fail without this compiler option.
     # see http://osgearth.org/wiki/FAQ for details.
-    QMAKE_CXXFLAGS += -Wl, -E
+    QMAKE_CXXFLAGS += -Wl,-E
 }
diff --git a/src/ui/map3D/GCManipulator.cc b/src/ui/map3D/GCManipulator.cc
index 83b0b6168..cdabc9665 100644
--- a/src/ui/map3D/GCManipulator.cc
+++ b/src/ui/map3D/GCManipulator.cc
@@ -254,7 +254,7 @@ GCManipulator::calcMovement()
     if (buttonMask == GUIEventAdapter::LEFT_MOUSE_BUTTON)
     {
         // rotate camera
-        osg::Vec3d axis;
+        osg::Vec3 axis;
         float angle;
 
         float px0 = _ga_t0->getXnormalized();
diff --git a/src/ui/map3D/Q3DWidget.cc b/src/ui/map3D/Q3DWidget.cc
index 0e08d85ac..5a0df71c8 100644
--- a/src/ui/map3D/Q3DWidget.cc
+++ b/src/ui/map3D/Q3DWidget.cc
@@ -34,7 +34,6 @@ This file is part of the QGROUNDCONTROL project
 #include <osg/Geometry>
 #include <osg/LineWidth>
 #include <osg/MatrixTransform>
-#include <Carbon/Carbon.h>
 
 Q3DWidget::Q3DWidget(QWidget* parent)
     : QGLWidget(parent)
-- 
2.22.0