From 938d4f95e05930794e700d339c5cf76040a89567 Mon Sep 17 00:00:00 2001 From: Raphael Grimm <raphael.grimm@kit.edu> Date: Sat, 31 Aug 2019 17:37:20 +0200 Subject: [PATCH] Remove #ifs for Qt versions --- SimDynamics/DynamicsEngine/BulletEngine/BulletCoinQtViewer.h | 2 -- VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/SimDynamics/DynamicsEngine/BulletEngine/BulletCoinQtViewer.h b/SimDynamics/DynamicsEngine/BulletEngine/BulletCoinQtViewer.h index c03c018dc..fa965ffef 100644 --- a/SimDynamics/DynamicsEngine/BulletEngine/BulletCoinQtViewer.h +++ b/SimDynamics/DynamicsEngine/BulletEngine/BulletCoinQtViewer.h @@ -38,9 +38,7 @@ #include <QtCore/QtGlobal> #include <QtGui/QtGui> #include <QtCore/QtCore> -#if QT_VERSION >= 0x050000 #include <QtWidgets/QFrame> -#endif namespace SimDynamics { diff --git a/VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.h b/VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.h index f80ddb31a..5f10e7eaf 100644 --- a/VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.h +++ b/VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.h @@ -12,9 +12,7 @@ #include <VirtualRobot/ManipulationObject.h> #include <string.h> #include <QtGui> -#if QT_VERSION >= 0x050000 #include <QtWidgets/QtWidgets> -#endif #include <QtCore/QtCore> #include <Inventor/sensors/SoTimerSensor.h> -- GitLab