Merge branch 'ros2:rolling' into updateOgre

Author: mosfet80

README.md

@@ -17,9 +17,9 @@ For some displays, the [documentation is updated](docs/FEATURES.md).
 | Axes                  | Move Camera   | Orbit                 | Displays        |
 | Camera                | Focus Camera  | XY Orbit              | Help            |
 | DepthCloud            | Measure       | First Person          | Selections      |
-| Effort                | Select        | Third Person Follower | Time            |
-| Fluid                 | 2D Nav Goal   | Top Down Orthographic | Tool Properties |
-| Grid                  | Publish Point |                       | Views           |
+| Effort                | Select        | Frame Aligned         | Time            |
+| Fluid                 | 2D Nav Goal   | Third Person Follower | Tool Properties |
+| Grid                  | Publish Point | Top Down Orthographic | Views           |
 | Grid Cells            | Initial Pose  |
 | Illuminance           | Interact      |
 | Image                 |

rviz2/CHANGELOG.rst

@@ -2,6 +2,20 @@
 Changelog for package rviz2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+15.1.4 (2025-06-20)
+-------------------
+
+15.1.3 (2025-05-20)
+-------------------
+* feat: support both qt5 and qt6 (`#1187 <https://github.com/ros2/rviz/issues/1187>`_)
+* Contributors: Daisuke Nishimatsu
+
+15.1.2 (2025-05-14)
+-------------------
+
+15.1.1 (2025-05-05)
+-------------------
+
 15.1.0 (2025-04-25)
 -------------------
 

rviz2/CMakeLists.txt

@@ -18,24 +18,25 @@ find_package(rviz_common REQUIRED)
 
 find_package(rviz_ogre_vendor REQUIRED)
 
-find_package(Qt5 REQUIRED COMPONENTS Widgets)
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
 # TODO(wjwwood): this block is to setup the windeployqt tool, could be removed later.
-if(Qt5_FOUND AND WIN32 AND TARGET Qt5::qmake AND NOT TARGET Qt5::windeployqt)
-  get_target_property(_qt5_qmake_location Qt5::qmake IMPORTED_LOCATION)
+if(Qt${QT_VERSION_MAJOR}_FOUND AND WIN32 AND TARGET Qt${QT_VERSION_MAJOR}::qmake AND NOT TARGET Qt${QT_VERSION_MAJOR}::windeployqt)
+  get_target_property(_qt_qmake_location Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION)
 
   execute_process(
-    COMMAND "${_qt5_qmake_location}" -query QT_INSTALL_PREFIX
+    COMMAND "${_qt_qmake_location}" -query QT${QT_VERSION_MAJOR}_INSTALL_PREFIX
     RESULT_VARIABLE return_code
-    OUTPUT_VARIABLE qt5_install_prefix
+    OUTPUT_VARIABLE qt_install_prefix
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
 
-  set(imported_location "${qt5_install_prefix}/bin/windeployqt.exe")
+  set(imported_location "${qt_install_prefix}/bin/windeployqt.exe")
 
   if(EXISTS ${imported_location})
-    add_executable(Qt5::windeployqt IMPORTED)
+    add_executable(Qt${QT_VERSION_MAJOR}::windeployqt IMPORTED)
 
-    set_target_properties(Qt5::windeployqt PROPERTIES
+    set_target_properties(Qt${QT_VERSION_MAJOR}::windeployqt PROPERTIES
       IMPORTED_LOCATION ${imported_location}
     )
   endif()
@@ -48,21 +49,21 @@ target_link_libraries(${PROJECT_NAME}
   rviz_common::rviz_common
   rviz_ogre_vendor::OgreMain
   rviz_ogre_vendor::OgreOverlay
-  Qt5::Widgets
+  Qt${QT_VERSION_MAJOR}::Widgets
 )
 
 # TODO(wjwwood): find a way to make this optional or to run without "deploying" the
 #                necessary dlls and stuff to the bin folder.
 #                see:
 # https://stackoverflow.com/questions/41193584/deploy-all-qt-dependencies-when-building#41199492
-if(TARGET Qt5::windeployqt)
+if(TARGET Qt${QT_VERSION_MAJOR}::windeployqt)
   # execute windeployqt in a tmp directory after build
   add_custom_command(TARGET ${PROJECT_NAME}
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/windeployqt"
-    COMMAND set PATH=%PATH%$<SEMICOLON>${qt5_install_prefix}/bin
+    COMMAND set PATH=%PATH%$<SEMICOLON>${qt_install_prefix}/bin
     COMMAND
-    Qt5::windeployqt
+    Qt${QT_VERSION_MAJOR}::windeployqt
     --dir "${CMAKE_CURRENT_BINARY_DIR}/windeployqt"
     "$<TARGET_FILE_DIR:${PROJECT_NAME}>/$<TARGET_FILE_NAME:${PROJECT_NAME}>"
   )

rviz2/package.xml

@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>rviz2</name>
-  <version>15.1.0</version>
+  <version>15.1.4</version>
   <description>
     3D visualization tool for ROS.
   </description>

rviz_assimp_vendor/CHANGELOG.rst

@@ -2,6 +2,20 @@
 Changelog for package rviz_assimp_vendor
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+15.1.4 (2025-06-20)
+-------------------
+
+15.1.3 (2025-05-20)
+-------------------
+
+15.1.2 (2025-05-14)
+-------------------
+
+15.1.1 (2025-05-05)
+-------------------
+* Clean ogre CMakeLists.txt (`#1251 <https://github.com/ros2/rviz/issues/1251>`_)
+* Contributors: mosfet80
+
 15.1.0 (2025-04-25)
 -------------------
 

rviz_assimp_vendor/CMakeLists.txt

@@ -4,11 +4,6 @@ project(rviz_assimp_vendor)
 find_package(ament_cmake REQUIRED)
 find_package(ament_cmake_vendor_package REQUIRED)
 
-# Override ON so that the following CMake logic in assimp 5.0.1 and older
-# doesn't result in a CMake warning: if(ON)
-#   https://github.com/ros2/rviz/issues/524
-#   https://bugs.launchpad.net/ubuntu/+source/assimp/+bug/1869405
-set(ON 1)
 
 # TODO: Switch to version range in find_package in CMake 3.19
 find_package(assimp QUIET)

rviz_assimp_vendor/package.xml

@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>rviz_assimp_vendor</name>
-  <version>15.1.0</version>
+  <version>15.1.4</version>
   <description>
     Wrapper around assimp, providing nothing but a dependency on assimp, on some systems.
     On others, it provides a fixed CMake module or even an ExternalProject build of assimp.

rviz_common/CHANGELOG.rst

@@ -2,6 +2,24 @@
 Changelog for package rviz_common
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+15.1.4 (2025-06-20)
+-------------------
+* Config::mapGetBool causes segmentation fault when value_out is nullptr (`#1471 <https://github.com/ros2/rviz/issues/1471>`_)
+* Contributors: Alejandro Hernández Cordero
+
+15.1.3 (2025-05-20)
+-------------------
+* feat: support both qt5 and qt6 (`#1187 <https://github.com/ros2/rviz/issues/1187>`_)
+* Contributors: Daisuke Nishimatsu
+
+15.1.2 (2025-05-14)
+-------------------
+
+15.1.1 (2025-05-05)
+-------------------
+* Fixed crash when a resource is not available (`#1455 <https://github.com/ros2/rviz/issues/1455>`_)
+* Contributors: Alejandro Hernández Cordero
+
 15.1.0 (2025-04-25)
 -------------------
 

rviz_common/CMakeLists.txt

@@ -31,7 +31,14 @@ find_package(ament_cmake REQUIRED)
 # do find_package(rviz_ogre_vendor) first to make sure the custom OGRE is found
 find_package(rviz_ogre_vendor REQUIRED)
 
-find_package(Qt5 REQUIRED COMPONENTS Widgets)
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+if(${QT_VERSION} VERSION_LESS 5.15.0)
+  function(qt_wrap_cpp out)
+    qt5_wrap_cpp(_sources ${ARGN})
+    set("${out}" ${_sources} PARENT_SCOPE)
+  endfunction()
+endif()
 
 find_package(geometry_msgs REQUIRED)
 find_package(pluginlib REQUIRED)
@@ -132,7 +139,7 @@ set(rviz_common_headers_to_moc
 )
 
 foreach(header "${rviz_common_headers_to_moc}")
-  qt5_wrap_cpp(rviz_common_moc_files "${header}")
+  qt_wrap_cpp(rviz_common_moc_files "${header}")
 endforeach()
 
 set(rviz_common_source_files
@@ -240,7 +247,7 @@ target_link_libraries(rviz_common PUBLIC
   ${geometry_msgs_TARGETS}
   message_filters::message_filters
   pluginlib::pluginlib
-  Qt5::Widgets
+  Qt${QT_VERSION_MAJOR}::Widgets
   rclcpp::rclcpp
   rviz_ogre_vendor::OgreMain
   rviz_ogre_vendor::OgreOverlay
@@ -266,7 +273,7 @@ ament_export_dependencies(
   geometry_msgs
   message_filters
   pluginlib
-  Qt5
+  Qt${QT_VERSION_MAJOR}
   rclcpp
   rviz_ogre_vendor
   rviz_rendering
@@ -325,10 +332,10 @@ if(BUILD_TESTING)
   find_package(ament_cmake_gmock REQUIRED)
   find_package(ament_cmake_gtest REQUIRED)
 
-  qt5_wrap_cpp(rviz_common_test_moc_files test/mock_display.hpp)
-  qt5_wrap_cpp(rviz_common_test_moc_files test/mock_property_change_receiver.hpp)
+  qt_wrap_cpp(rviz_common_test_moc_files test/mock_display.hpp)
+  qt_wrap_cpp(rviz_common_test_moc_files test/mock_property_change_receiver.hpp)
 
-  qt5_wrap_cpp(rviz_common_test_frame_manager_moc src/rviz_common/frame_manager.hpp)
+  qt_wrap_cpp(rviz_common_test_frame_manager_moc src/rviz_common/frame_manager.hpp)
 
   ament_add_gmock(display_factory_test
     test/display_factory_test.cpp
@@ -337,7 +344,7 @@ if(BUILD_TESTING)
   if(TARGET display_factory_test)
     target_compile_definitions(display_factory_test PUBLIC
       -D_TEST_PLUGIN_DESCRIPTIONS="${CMAKE_CURRENT_SOURCE_DIR}")
-    target_link_libraries(display_factory_test rviz_common Qt5::Widgets)
+    target_link_libraries(display_factory_test rviz_common Qt${QT_VERSION_MAJOR}::Widgets)
   endif()
 
   ament_add_gmock(frame_manager_test
@@ -446,7 +453,7 @@ if(BUILD_TESTING)
     test/mock_property_change_receiver.cpp
     ${SKIP_DISPLAY_TESTS})
   if(TARGET rviz_common_display_test)
-    target_link_libraries(rviz_common_display_test rviz_common Qt5::Widgets yaml-cpp::yaml-cpp)
+    target_link_libraries(rviz_common_display_test rviz_common Qt${QT_VERSION_MAJOR}::Widgets yaml-cpp::yaml-cpp)
   endif()
 endif()
 

rviz_common/include/rviz_common/properties/ros_topic_property.hpp

@@ -32,6 +32,7 @@
 
 #include <string>
 
+#include <QRegularExpression>  // NOLINT: cpplint is unable to handle the include order here
 #include <QString>  // NOLINT: cpplint is unable to handle the include order here
 
 #include "rviz_common/properties/editable_enum_property.hpp"
@@ -92,20 +93,20 @@ class RVIZ_COMMON_PUBLIC RosFilteredTopicProperty
     const QString & default_value = QString(),
     const QString & message_type = QString(),
     const QString & description = QString(),
-    const QRegExp & filter = QRegExp(),
+    const QRegularExpression & filter = QRegularExpression(),
     Property * parent = 0,
     const char * changed_slot = 0,
     QObject * receiver = 0);
 
   void enableFilter(bool enabled);
 
-  QRegExp filter() const;
+  QRegularExpression filter() const;
 
 protected Q_SLOTS:
   void fillTopicList() override;
 
 private:
-  QRegExp filter_;
+  QRegularExpression filter_;
   bool filter_enabled_;
 };