Merge pull request #935 from fran6co/qt5

Fix for point_cloud_editor using QT5
PointCloudLibrary · Oct 1, 2014 · b8c4320 · b8c4320
2 parents 21c5f0e + e390f36
commit b8c4320
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/mainWindow.h b/apps/point_cloud_editor/include/pcl/apps/point_cloud_editor/mainWindow.h
@@ -45,6 +45,13 @@
 
 #include <QtGui>
 #include <QMainWindow>
+#include <QActionGroup>
+#include <QSpinBox>
+#include <QSlider>
+#include <QMessageBox>
+#include <QMenu>
+#include <QMenuBar>
+#include <QToolBar>
 #include <pcl/apps/point_cloud_editor/localTypes.h>
 
 // Forward declaration to prevent circular inclusion

diff --git a/cmake/pcl_find_qt5.cmake b/cmake/pcl_find_qt5.cmake
@@ -55,6 +55,8 @@ if(Qt5Core_FOUND)
     # set(CMAKE_AUTOMOC ON)
     # set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+    set(QT_QTOPENGL_INCLUDE_DIR Qt5OpenGL_INCLUDE_DIRS)
+
     # Replace qt4 macros.
     macro(qt4_wrap_cpp)
         qt5_wrap_cpp(${ARGN})