Merge branch 'master' of https://github.com/Tobias-Fischer/rtabmap into Tobias-Fischer-master

examples/RGBDMapping/CMakeLists.txt

@@ -7,7 +7,9 @@ SET(INCLUDE_DIRS
     ${PCL_INCLUDE_DIRS}
 )
 
-INCLUDE(${QT_USE_FILE})
+IF("${RTABMAP_QT_VERSION}" STREQUAL "4")
+    INCLUDE(${QT_USE_FILE})
+ENDIF()
 
 SET(LIBRARIES
 	${OpenCV_LIBRARIES}
@@ -17,7 +19,11 @@ SET(LIBRARIES
 
 INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
 
-QT4_WRAP_CPP(moc_srcs MapBuilder.h)
+IF("${RTABMAP_QT_VERSION}" STREQUAL "4")
+    QT4_WRAP_CPP(moc_srcs MapBuilder.h)
+ELSE()
+    QT5_WRAP_CPP(moc_srcs MapBuilder.h)
+ENDIF()
 
 ADD_EXECUTABLE(rgbd_mapping main.cpp ${moc_srcs})
   

examples/RGBDMapping/MapBuilder.h

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef MAPBUILDER_H_
 #define MAPBUILDER_H_
 
-#include <QtGui/QVBoxLayout>
+#include <QVBoxLayout>
 #include <QtCore/QMetaType>
 
 #ifndef Q_MOC_RUN // Mac OS X issue

examples/RGBDMapping/main.cpp

@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "rtabmap/core/CameraThread.h"
 #include "rtabmap/core/Odometry.h"
 #include "rtabmap/utilite/UEventsManager.h"
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <stdio.h>
 
 #include "MapBuilder.h"