@@ -45,3 +45,82 @@ index 3cd6466..7c471d5 100644
4545 case 3:
4646 return tr("time");
4747 }
48+ diff --git a/motion_planning_tasks/src/CMakeLists.txt b/motion_planning_tasks/src/CMakeLists.txt
49+ --- a/motion_planning_tasks/src/CMakeLists.txt
50+ +++ b/motion_planning_tasks/src/CMakeLists.txt
51+ @@ -6,6 +6,8 @@
52+ global_settings.ui
53+ )
54+
55+ + qt6_add_resources(QRC_SOURCES resources.qrc)
56+ +
57+ add_library(${MOVEIT_LIB_NAME} SHARED
58+ factory_model.cpp
59+ icons.cpp
60+ @@ -22,7 +24,7 @@
61+
62+ ${UIC_FILES}
63+
64+ - resources.qrc
65+ + ${QRC_SOURCES}
66+ )
67+
68+ set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
69+ diff --git a/motion_planning_tasks/utils/flat_merge_proxy_model.h b/motion_planning_tasks/utils/flat_merge_proxy_model.h
70+ --- a/motion_planning_tasks/utils/flat_merge_proxy_model.h
71+ +++ b/motion_planning_tasks/utils/flat_merge_proxy_model.h
72+ @@ -38,6 +38,16 @@
73+
74+ #include <QAbstractItemModel>
75+ #include <QStringList>
76+ + #if defined(_WIN32)
77+ + #if defined(motion_planning_tasks_utils_EXPORTS)
78+ + #define MOVEIT_RVIZ_UTILS_EXPORT __declspec(dllexport)
79+ + #else
80+ + #define MOVEIT_RVIZ_UTILS_EXPORT __declspec(dllimport)
81+ + #endif
82+ + #else
83+ + #define MOVEIT_RVIZ_UTILS_EXPORT
84+ + #endif
85+ +
86+
87+ namespace moveit_rviz_plugin {
88+ namespace utils {
89+ @@ -49,7 +59,7 @@
90+ * Removing top-level items will remove the whole embedded model if all top-level items from
91+ * this model are to be removed. Otherwise, removal is forwarded to the embedded model.
92+ */
93+ - class FlatMergeProxyModel : public QAbstractItemModel
94+ + class MOVEIT_RVIZ_UTILS_EXPORT FlatMergeProxyModel : public QAbstractItemModel
95+ {
96+ Q_OBJECT
97+ Q_DECLARE_PRIVATE(FlatMergeProxyModel)
98+ diff --git a/motion_planning_tasks/utils/tree_merge_proxy_model.h b/motion_planning_tasks/utils/tree_merge_proxy_model.h
99+ --- a/motion_planning_tasks/utils/tree_merge_proxy_model.h
100+ +++ b/motion_planning_tasks/utils/tree_merge_proxy_model.h
101+ @@ -38,6 +38,16 @@
102+
103+ #include <QAbstractItemModel>
104+ #include <QStringList>
105+ + #if defined(_WIN32)
106+ + #if defined(motion_planning_tasks_utils_EXPORTS)
107+ + #define MOVEIT_RVIZ_UTILS_EXPORT __declspec(dllexport)
108+ + #else
109+ + #define MOVEIT_RVIZ_UTILS_EXPORT __declspec(dllimport)
110+ + #endif
111+ + #else
112+ + #define MOVEIT_RVIZ_UTILS_EXPORT
113+ + #endif
114+ +
115+
116+ namespace moveit_rviz_plugin {
117+ namespace utils {
118+ @@ -48,7 +58,7 @@
119+ * Each embedded model becomes a top-level item (with a given name)
120+ * and all the model's top-level items will appear as its children.
121+ */
122+ - class TreeMergeProxyModel : public QAbstractItemModel
123+ + class MOVEIT_RVIZ_UTILS_EXPORT TreeMergeProxyModel : public QAbstractItemModel
124+ {
125+ Q_OBJECT
126+ Q_DECLARE_PRIVATE(TreeMergeProxyModel)
0 commit comments