From d06d1e0e63855f26295efe23ba7688cc243b7637 Mon Sep 17 00:00:00 2001
From: Luca Della Vedova <lucadv@intrinsic.ai>
Date: Thu, 4 Dec 2025 09:54:15 +0800
Subject: [PATCH 1/2] Remove explicit Qt dependency from rviz plugins

Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>
---
 rmf_visualization_rviz2_plugins/CMakeLists.txt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/rmf_visualization_rviz2_plugins/CMakeLists.txt b/rmf_visualization_rviz2_plugins/CMakeLists.txt
index d344ec7..aefb05e 100644
--- a/rmf_visualization_rviz2_plugins/CMakeLists.txt
+++ b/rmf_visualization_rviz2_plugins/CMakeLists.txt
@@ -31,7 +31,6 @@ find_package(rviz_common REQUIRED)
 find_package(rviz_rendering REQUIRED)
 find_package(rviz_default_plugins REQUIRED)
 find_package(rmf_traffic_ros2 REQUIRED)
-find_package(Qt5 REQUIRED COMPONENTS Widgets Test)
 
 if(BUILD_TESTING)
   find_package(ament_cmake_uncrustify REQUIRED)
@@ -66,16 +65,12 @@ target_link_libraries(${PROJECT_NAME}
     rviz_common::rviz_common
     rviz_rendering::rviz_rendering
     rviz_default_plugins::rviz_default_plugins
-    ${QT5_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
 )
 
 target_include_directories(${PROJECT_NAME}
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:include>
-    ${Qt5Widgets_INCLUDE_DIRS}
-    ${QT5_INCLUDE_DIRS}
 )
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
@@ -88,10 +83,8 @@ ament_export_include_directories(include)
 ament_export_targets(${PROJECT_NAME} HAS_LIBRARY_TARGET)
 
 ament_export_dependencies(
-  Qt5
   rviz_common
   rclcpp
-  Qt5Widgets
 )
 
 install(

From 404504c5b6ed2fda2ae7d434e9c77a78f9157148 Mon Sep 17 00:00:00 2001
From: Luca Della Vedova <lucadv@intrinsic.ai>
Date: Tue, 13 Jan 2026 12:30:34 +0800
Subject: [PATCH 2/2] Remove qt5 from package.xml

Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>
---
 rmf_visualization_rviz2_plugins/package.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rmf_visualization_rviz2_plugins/package.xml b/rmf_visualization_rviz2_plugins/package.xml
index 7f4c0d2..9c513fd 100644
--- a/rmf_visualization_rviz2_plugins/package.xml
+++ b/rmf_visualization_rviz2_plugins/package.xml
@@ -22,10 +22,6 @@
   <depend>resource_retriever</depend>
 
   <build_depend>eigen</build_depend>
-  <build_depend>qtbase5-dev</build_depend>
-  <exec_depend>libqt5-core</exec_depend>
-  <exec_depend>libqt5-gui</exec_depend>
-  <exec_depend>libqt5-widgets</exec_depend>
 
   <test_depend>ament_cmake_uncrustify</test_depend>
   <test_depend>rmf_utils</test_depend>