diff --git a/visualization/motion_planning_tasks/src/task_list_model.cpp b/visualization/motion_planning_tasks/src/task_list_model.cpp index c4bb522f..c5e9e762 100644 --- a/visualization/motion_planning_tasks/src/task_list_model.cpp +++ b/visualization/motion_planning_tasks/src/task_list_model.cpp @@ -46,6 +46,7 @@ #include #include #include +#include namespace moveit_rviz_plugin { @@ -306,7 +307,9 @@ AutoAdjustingTreeView::AutoAdjustingTreeView(QWidget *parent) : QTreeView(parent) { // consider viewportSizeHint() +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents); +#endif } void AutoAdjustingTreeView::setStretchSection(int section) diff --git a/visualization/motion_planning_tasks/src/task_list_model.h b/visualization/motion_planning_tasks/src/task_list_model.h index f16215aa..32165b8b 100644 --- a/visualization/motion_planning_tasks/src/task_list_model.h +++ b/visualization/motion_planning_tasks/src/task_list_model.h @@ -150,7 +150,7 @@ public: class AutoAdjustingTreeView : public QTreeView { Q_OBJECT - Q_PROPERTY(int stretchSection MEMBER stretch_section_ READ stretchSection WRITE setStretchSection) + Q_PROPERTY(int stretchSection READ stretchSection WRITE setStretchSection) mutable std::vector size_hints_; // size hints for sections QList auto_hide_cols_; // auto-hiding sections @@ -165,7 +165,7 @@ public: void setAutoHideSections(const QList §ions); void setModel(QAbstractItemModel *model); - QSize viewportSizeHint() const override; + QSize viewportSizeHint() const; void resizeEvent(QResizeEvent *event) override; }; diff --git a/visualization/motion_planning_tasks/src/task_panel.h b/visualization/motion_planning_tasks/src/task_panel.h index 008fd252..6eddca97 100644 --- a/visualization/motion_planning_tasks/src/task_panel.h +++ b/visualization/motion_planning_tasks/src/task_panel.h @@ -40,6 +40,7 @@ #include #include +#include namespace moveit_rviz_plugin { diff --git a/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.cpp b/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.cpp index 299fae05..3661b9cf 100644 --- a/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.cpp +++ b/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.cpp @@ -35,6 +35,8 @@ /* Author: Robert Haschke */ #include "flat_merge_proxy_model.h" +#include +#include namespace moveit_rviz_plugin { namespace utils { diff --git a/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.h b/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.h index 1a9999cf..a937f6b6 100644 --- a/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.h +++ b/visualization/motion_planning_tasks/utils/flat_merge_proxy_model.h @@ -103,7 +103,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)) Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsMoved(QModelIndex,int,int,QModelIndex,int)) -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= 0x050000 // due to moc issue we need to use the hex number Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex,QVector)) #else Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex)) diff --git a/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.cpp b/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.cpp index 3ef819bd..27bd1c23 100644 --- a/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.cpp +++ b/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.cpp @@ -35,6 +35,7 @@ /* Author: Robert Haschke */ #include "tree_merge_proxy_model.h" +#include namespace moveit_rviz_plugin { namespace utils { diff --git a/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.h b/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.h index c0b7dddb..50de93c0 100644 --- a/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.h +++ b/visualization/motion_planning_tasks/utils/tree_merge_proxy_model.h @@ -106,7 +106,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)) Q_PRIVATE_SLOT(d_func(), void _q_sourceRowsMoved(QModelIndex,int,int,QModelIndex,int)) -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#if QT_VERSION >= 0x050000 // due to moc issue we need to use the hex number Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex,QVector)) #else Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex))