Add QT5 Support

tools/Calibration/CMakeLists.txt

@@ -6,7 +6,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} 
@@ -26,4 +28,4 @@ SET_TARGET_PROPERTIES( calibration
   
 INSTALL(TARGETS calibration
 		RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime
-		BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)
+		BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)

tools/Calibration/main.cpp

@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "rtabmap/utilite/ULogger.h"
 #include "rtabmap/utilite/UConversion.h"
 #include "rtabmap/gui/CalibrationDialog.h"
-#include <QtGui/QApplication>
+#include <QApplication>
 
 void showUsage()
 {

tools/DataRecorder/CMakeLists.txt

@@ -11,7 +11,9 @@ SET(INCLUDE_DIRS
     ${PCL_INCLUDE_DIRS}
 )
 
-INCLUDE(${QT_USE_FILE})
+IF("${RTABMAP_QT_VERSION}" STREQUAL "4")
+    INCLUDE(${QT_USE_FILE})
+ENDIF()
 
 SET(LIBRARIES
 	${PCL_LIBRARIES} 

tools/DataRecorder/main.cpp

@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <rtabmap/core/Camera.h>
 #include <rtabmap/core/CameraThread.h>
 #include <rtabmap/gui/DataRecorder.h>
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <signal.h>
 
 using namespace rtabmap;

tools/DatabaseViewer/CMakeLists.txt

@@ -11,7 +11,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}

tools/DatabaseViewer/main.cpp

@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include "rtabmap/gui/DatabaseViewer.h"
 #include "rtabmap/utilite/ULogger.h"
 

tools/EpipolarGeometry/CMakeLists.txt

@@ -11,7 +11,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}

tools/EpipolarGeometry/main.cpp

@@ -45,13 +45,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "rtabmap/gui/ImageView.h"
 #include "rtabmap/gui/KeypointItem.h"
-#include <QtGui/QApplication>
-#include <QtGui/QGraphicsLineItem>
-#include <QtGui/QGraphicsPixmapItem>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
+#include <QApplication>
+#include <QGraphicsLineItem>
+#include <QGraphicsPixmapItem>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 #include <QtCore/QTime>
-#include <QtGui/QGraphicsEffect>
+#include <QGraphicsEffect>
 
 
 using namespace rtabmap;

tools/OdometryViewer/CMakeLists.txt

@@ -11,7 +11,9 @@ SET(INCLUDE_DIRS
     ${PCL_INCLUDE_DIRS}
 )
 
-INCLUDE(${QT_USE_FILE})
+IF("${RTABMAP_QT_VERSION}" STREQUAL "4")
+    INCLUDE(${QT_USE_FILE})
+ENDIF()
 
 SET(LIBRARIES
 	${PCL_LIBRARIES} 

tools/OdometryViewer/main.cpp

@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <rtabmap/core/CameraRGBD.h>
 #include <rtabmap/core/DBReader.h>
 #include <rtabmap/core/VWDictionary.h>
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <pcl/console/print.h>
 
 void showUsage()