Merge branch 'mergeRempte' into experimental

qgroundcontrol.pri

@@ -158,6 +158,7 @@ linux-g++ {
     QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
 
     INCLUDEPATH += /usr/include \
+				   /usr/local/include \
                    /usr/include/qt4/phonon
               # $$BASEDIR/lib/flite/include \
               # $$BASEDIR/lib/flite/lang

src/ui/map3D/GCManipulator.cc

@@ -254,10 +254,10 @@ GCManipulator::calcMovement(void)
     if (buttonMask == GUIEventAdapter::LEFT_MOUSE_BUTTON)
     {
         // rotate camera
-#ifdef __APPLE__
-        osg::Vec3d axis;
-#else
+#ifdef __WIN32__
         osg::Vec3 axis;
+#else
+        osg::Vec3d axis;
 #endif
         float angle;
 

src/ui/map3D/QMap3D.cc

@@ -39,7 +39,7 @@ QMap3D::QMap3D(QWidget * parent, const char * name, WindowFlags f) :
         QWidget(parent,f)
 {
     setupUi(this);
-    graphicsView->setCameraManipulator(new osgEarthUtil::EarthManipulator);
+    graphicsView->setCameraManipulator(new osgEarth::Util::EarthManipulator);
     graphicsView->setSceneData(new osg::Group);
     graphicsView->updateCamera();
     show();