Fix for Qt5/Ubuntu compilation on OSG 3.2

OpenModelica · Sep 29, 2016 · f83f568 · f83f568
1 parent 6291818
commit f83f568
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/OMEdit/OMEditGUI/Animation/AnimationWindow.cpp b/OMEdit/OMEditGUI/Animation/AnimationWindow.cpp
@@ -223,7 +223,9 @@ QWidget* AnimationWindow::setupViewWidget()
   camera->setProjectionMatrixAsPerspective(30.0f, static_cast<double>(traits->width/2) / static_cast<double>(traits->height/2), 1.0f, 10000.0f);
   mpSceneView->addEventHandler(new osgViewer::StatsHandler());
   mpSceneView->setCameraManipulator(new osgGA::MultiTouchTrackballManipulator());
+#if OSG_VERSION_GREATER_OR_EQUAL(3,4,0)
   gw->setTouchEventsEnabled(true);
+#endif
   return gw->getGLWidget();
 }
 

diff --git a/OMEdit/OMEditGUI/Animation/AnimationWindow.h b/OMEdit/OMEditGUI/Animation/AnimationWindow.h
@@ -50,7 +50,7 @@
 #include <osg/Vec3>
 #include <osgDB/ReadFile>
 #include <osgGA/MultiTouchTrackballManipulator>
-#include <../../osgQt/GraphicsWindowQt>
+#include <../../osgQt/OMEdit_GraphicsWindowQt.h>
 #include <osg/Version>
 #include <osgViewer/CompositeViewer>
 #include <osgViewer/View>

diff --git a/OMEdit/OMEditGUI/OMEditGUI.pro b/OMEdit/OMEditGUI/OMEditGUI.pro
@@ -199,7 +199,7 @@ HEADERS  += Util/Helper.h \
   Editors/MetaModelEditor.h \
   Editors/MetaModelicaEditor.h \
   #$$OPENMODELICAHOME/../OMCompiler/3rdParty/FMIL/build/fmilib.h \
-  ../../osgQt/GraphicsWindowQt \
+  ../../osgQt/OMEdit_GraphicsWindowQt.h \
   ../../osgQt/Export \
   Animation/AnimationWindow.h \
   Animation/AnimationUtil.h \

diff --git a/osgQt/GraphicsWindowQt.cpp b/osgQt/GraphicsWindowQt.cpp
@@ -12,7 +12,7 @@
 */
 
 #include <osg/DeleteHandler>
-#include "GraphicsWindowQt"
+#include "OMEdit_GraphicsWindowQt.h"
 #include <osgViewer/ViewerBase>
 #include <QtGui/QInputEvent>
 #include <QtCore/QPointer>
@@ -23,14 +23,6 @@
 # include <QGesture>
 #endif
 
-/*
-
-#include <QtCore/QMutex>
-#include <QtCore/QEvent>
-#include <QtCore/QQueue>
-#include <QtCore/QSet>
-#include <QtCore/QGLWidget>
-*/
 using namespace osgQt;
 
 

diff --git a/osgQt/GraphicsWindowQt → osgQt/OMEdit_GraphicsWindowQt.h b/osgQt/GraphicsWindowQt → osgQt/OMEdit_GraphicsWindowQt.h