Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Qt version checks #2762

Merged
merged 1 commit into from
Jan 13, 2019
Merged

Remove Qt version checks #2762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ endif()

option(WITH_QT "Build QT Front-End" TRUE)
if(WITH_QT)
find_package(Qt5 COMPONENTS OpenGL Widgets QUIET)
find_package(Qt5 COMPONENTS Concurrent OpenGL Widgets QUIET)
endif()

# Find VTK
Expand Down
2 changes: 0 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/tools/euclidean_clustering.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ namespace pcl
{
Q_OBJECT
Q_INTERFACES (pcl::cloud_composer::ToolFactory)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
public:
SplitItemTool*
createTool (PropertiesModel* parameter_model, QObject* parent = 0) override
Expand Down
2 changes: 0 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/tools/fpfh_estimation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ namespace pcl
{
Q_OBJECT
Q_INTERFACES (pcl::cloud_composer::ToolFactory)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
public:
NewItemTool*
createTool (PropertiesModel* parameter_model, QObject* parent = 0) override
Expand Down
2 changes: 0 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/tools/normal_estimation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ namespace pcl
{
Q_OBJECT
Q_INTERFACES (pcl::cloud_composer::ToolFactory)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
public:
NewItemTool*
createTool (PropertiesModel* parameter_model, QObject* parent = 0) override
Expand Down
2 changes: 0 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/tools/organized_segmentation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@
{
Q_OBJECT
Q_INTERFACES (pcl::cloud_composer::ToolFactory)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
public:
SplitItemTool*
createTool (PropertiesModel* parameter_model, QObject* parent = 0) override
Expand Down
2 changes: 0 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/tools/sanitize_cloud.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ namespace pcl
{
Q_OBJECT
Q_INTERFACES (pcl::cloud_composer::ToolFactory)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
public:
ModifyItemTool*
createTool (PropertiesModel* parameter_model, QObject* parent = 0) override
Expand Down
2 changes: 0 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/tools/statistical_outlier_removal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ namespace pcl
{
Q_OBJECT
Q_INTERFACES (pcl::cloud_composer::ToolFactory)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
public:
ModifyItemTool*
createTool (PropertiesModel* parameter_model, QObject* parent = 0) override
Expand Down
2 changes: 0 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/tools/supervoxels.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@
{
Q_OBJECT
Q_INTERFACES (pcl::cloud_composer::ToolFactory)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
public:
SplitItemTool*
createTool (PropertiesModel* parameter_model, QObject* parent = 0) override
Expand Down
2 changes: 0 additions & 2 deletions apps/cloud_composer/include/pcl/apps/cloud_composer/tools/voxel_grid_downsample.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ namespace pcl
{
Q_OBJECT
Q_INTERFACES (pcl::cloud_composer::ToolFactory)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
public:
ModifyItemTool*
createTool (PropertiesModel* parameter_model, QObject* parent = 0) override
Expand Down
6 changes: 1 addition & 5 deletions apps/cloud_composer/tools/euclidean_clustering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
#include <pcl/kdtree/kdtree.h>
#include <pcl/segmentation/extract_clusters.h>

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(cloud_composer_euclidean_clustering_tool, pcl::cloud_composer::EuclideanClusteringToolFactory)
#else
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")

pcl::cloud_composer::EuclideanClusteringTool::EuclideanClusteringTool (PropertiesModel* parameter_model, QObject* parent)
: SplitItemTool (parameter_model, parent)
Expand Down
7 changes: 1 addition & 6 deletions apps/cloud_composer/tools/fpfh_estimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@
#include <pcl/point_types.h>
#include <pcl/filters/filter.h>


#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(cloud_composer_fpfh_estimation_tool, pcl::cloud_composer::FPFHEstimationToolFactory)
#else
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")

pcl::cloud_composer::FPFHEstimationTool::FPFHEstimationTool (PropertiesModel* parameter_model, QObject* parent)
: NewItemTool (parameter_model, parent)
Expand Down
6 changes: 1 addition & 5 deletions apps/cloud_composer/tools/normal_estimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
#include <pcl/features/normal_3d.h>
#include <pcl/point_types.h>

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(cloud_composer_normal_estimation_tool, pcl::cloud_composer::NormalEstimationToolFactory)
#else
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")

pcl::cloud_composer::NormalEstimationTool::NormalEstimationTool (PropertiesModel* parameter_model, QObject* parent)
: NewItemTool (parameter_model, parent)
Expand Down
6 changes: 1 addition & 5 deletions apps/cloud_composer/tools/organized_segmentation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@

#include <pcl/apps/cloud_composer/tools/impl/organized_segmentation.hpp>

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(cloud_composer_organized_segmentation_tool, pcl::cloud_composer::OrganizedSegmentationToolFactory)
#else
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")

pcl::cloud_composer::OrganizedSegmentationTool::OrganizedSegmentationTool (PropertiesModel* parameter_model, QObject* parent)
: SplitItemTool (parameter_model, parent)
Expand Down
7 changes: 1 addition & 6 deletions apps/cloud_composer/tools/sanitize_cloud.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
#include <pcl/apps/cloud_composer/items/cloud_item.h>
#include <pcl/filters/passthrough.h>


#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(cloud_composer_sanitize_cloud_tool, pcl::cloud_composer::SanitizeCloudToolFactory)
#else
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")

pcl::cloud_composer::SanitizeCloudTool::SanitizeCloudTool (PropertiesModel* parameter_model, QObject* parent)
: ModifyItemTool (parameter_model, parent)
Expand Down
6 changes: 1 addition & 5 deletions apps/cloud_composer/tools/statistical_outlier_removal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
#include <pcl/filters/statistical_outlier_removal.h>
#include <pcl/point_types.h>

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(cloud_composer_statistical_outlier_removal_tool, pcl::cloud_composer::StatisticalOutlierRemovalToolFactory)
#else
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")

pcl::cloud_composer::StatisticalOutlierRemovalTool::StatisticalOutlierRemovalTool (PropertiesModel* parameter_model, QObject* parent)
: ModifyItemTool (parameter_model, parent)
Expand Down
6 changes: 1 addition & 5 deletions apps/cloud_composer/tools/supervoxels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@

#include <pcl/apps/cloud_composer/tools/impl/supervoxels.hpp>

#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(cloud_composer_voxel_superpixels_tool, pcl::cloud_composer::SupervoxelsToolFactory)
#else
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")

pcl::cloud_composer::SupervoxelsTool::SupervoxelsTool (PropertiesModel* parameter_model, QObject* parent)
: SplitItemTool (parameter_model, parent)
Expand Down
6 changes: 1 addition & 5 deletions apps/cloud_composer/tools/voxel_grid_downsample.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
#include <pcl/point_types.h>


#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(cloud_composer_voxel_grid_downsample_tool, pcl::cloud_composer::VoxelGridDownsampleToolFactory)
#else
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")
#endif
Q_PLUGIN_METADATA(IID "cloud_composer.ToolFactory/1.0")

pcl::cloud_composer::VoxelGridDownsampleTool::VoxelGridDownsampleTool (PropertiesModel* parameter_model, QObject* parent)
: ModifyItemTool (parameter_model, parent)
Expand Down
4 changes: 2 additions & 2 deletions apps/in_hand_scanner/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ list(APPEND SRCS "${MOC_IN_HAND_SCANNER_SRC}" "${MOC_OPENGL_VIEWER_SRC}" "${MOC_

set(EXE_NAME "pcl_${SUBSUBSYS_NAME}")
pcl_add_executable_opt_bundle("${EXE_NAME}" "${SUBSUBSYS_NAME}" ${SRCS} ${INCS} ${IMPL_INCS})
target_link_libraries("${EXE_NAME}" ${SUBSUBSYS_LIBS} ${OPENGL_LIBRARIES} Qt5::Widgets Qt5::OpenGL)
target_link_libraries("${EXE_NAME}" ${SUBSUBSYS_LIBS} ${OPENGL_LIBRARIES} Qt5::Concurrent Qt5::Widgets Qt5::OpenGL)

pcl_add_includes("${SUBSUBSYS_NAME}" "${SUBSUBSYS_NAME}" ${INCS})
pcl_add_includes("${SUBSUBSYS_NAME}" "${SUBSUBSYS_NAME}/impl" ${IMPL_INCS})
Expand All @@ -131,7 +131,7 @@ list(APPEND OI_INCS "${MOC_OPENGL_VIEWER_INC}" "${MOC_OFFLINE_INTEGRATION_INC}")
list(APPEND OI_SRCS "${MOC_OPENGL_VIEWER_SRC}" "${MOC_OFFLINE_INTEGRATION_SRC}")

pcl_add_executable_opt_bundle(pcl_offline_integration "${SUBSUBSYS_NAME}" ${OI_SRCS} ${OI_INCS})
target_link_libraries(pcl_offline_integration ${SUBSUBSYS_LIBS} ${OPENGL_LIBRARIES} Qt5::Widgets Qt5::OpenGL)
target_link_libraries(pcl_offline_integration ${SUBSUBSYS_LIBS} ${OPENGL_LIBRARIES} Qt5::Concurrent Qt5::Widgets Qt5::OpenGL)

# Add to the compound apps target
list(APPEND PCL_APPS_ALL_TARGETS ${PCL_IN_HAND_SCANNER_ALL_TARGETS})
Expand Down
4 changes: 1 addition & 3 deletions apps/in_hand_scanner/src/in_hand_scanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@
#include <QtCore>
#include <QKeyEvent>
#include <QPainter>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#include <QtConcurrent/QtConcurrent>
#endif
#include <QtConcurrent>

#include <pcl/exceptions.h>
#include <pcl/common/time.h>
Expand Down
4 changes: 1 addition & 3 deletions apps/in_hand_scanner/src/offline_integration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@
#include <QFileDialog>
#include <QtCore>
#include <QKeyEvent>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
#include <QtConcurrent/QtConcurrent>
#endif
#include <QtConcurrent>

#include <pcl/io/pcd_io.h>
#include <pcl/common/transforms.h>
Expand Down
4 changes: 0 additions & 4 deletions apps/modeler/src/parameter_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,7 @@ pcl::modeler::ParameterDialog::exec()
tableView.setItemDelegate(&parameterDelegate);

tableView.horizontalHeader()->setStretchLastSection(true);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
tableView.horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
#else
tableView.horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
#endif
tableView.setShowGrid(true);
tableView.verticalHeader()->hide();
tableView.setSelectionBehavior(QAbstractItemView::SelectRows);
Expand Down