qt5 apps support

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1103 fdac6126-5c0c-442c-9429-916003d36597
2014-07-17 12:57:04 +00:00
parent 71fd144089
commit 3ff415a5c2
9 changed files with 248 additions and 11 deletions
--- a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt
+++ b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt
@@ -23,8 +23,13 @@ acg_append_files (ui "*.ui" ${directories})
 acg_drop_templates (sources)

 # genereate uic and moc targets
-acg_qt4_autouic (uic_targets ${ui})
-acg_qt4_automoc (moc_targets ${headers})
+if(QT5_FOUND)
+  acg_qt5_autouic (uic_targets ${ui})
+  acg_qt5_automoc (moc_targets ${headers})
+else()
+  acg_qt4_autouic (uic_targets ${ui})
+  acg_qt4_automoc (moc_targets ${headers})
+endif()


 if (WIN32)
--- a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh
+++ b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh
@@ -48,7 +48,7 @@


 #include <OpenMesh/Core/Geometry/VectorT.hh>
-#include <QtOpenGL/qgl.h>
+#include <QGLWidget>
 #include <string>
 #include <vector>
 #include <map>