Skip to content

Commit ebaf641

Browse files
committed
Merge remote-tracking branch 'origin/rolling' into ahcorde/rolling/qt6
2 parents 978dce2 + ee23724 commit ebaf641

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1676
-1092
lines changed

qt_dotgraph/CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
Changelog for package qt_dotgraph
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.8.2 (2024-07-10)
6+
------------------
7+
8+
2.8.1 (2024-06-25)
9+
------------------
10+
* Skip running the tests on Windows Debug. (`#292 <https://github.com/ros-visualization/qt_gui_core/issues/292>`_)
11+
* Contributors: Chris Lalancette
12+
513
2.8.0 (2024-04-26)
614
------------------
715

qt_dotgraph/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package format="2">
22
<name>qt_dotgraph</name>
3-
<version>2.8.0</version>
3+
<version>2.8.2</version>
44
<description>
55
qt_dotgraph provides helpers to work with dot graphs.
66
</description>

qt_gui/CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Changelog for package qt_gui
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.8.2 (2024-07-10)
6+
------------------
7+
8+
2.8.1 (2024-06-25)
9+
------------------
10+
511
2.8.0 (2024-04-26)
612
------------------
713

qt_gui/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package format="2">
22
<name>qt_gui</name>
3-
<version>2.8.0</version>
3+
<version>2.8.2</version>
44
<description>
55
qt_gui provides the infrastructure for an integrated graphical user interface based on Qt.
66
It is extensible with Python- and C++-based plugins (implemented in separate packages) which can contribute arbitrary widgets.

qt_gui_app/CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Changelog for package qt_gui_app
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.8.2 (2024-07-10)
6+
------------------
7+
8+
2.8.1 (2024-06-25)
9+
------------------
10+
511
2.8.0 (2024-04-26)
612
------------------
713

qt_gui_app/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package format="2">
22
<name>qt_gui_app</name>
3-
<version>2.8.0</version>
3+
<version>2.8.2</version>
44
<description>
55
qt_gui_app provides the main to start an instance of the integrated graphical user interface provided by qt_gui.
66
</description>

qt_gui_core/CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Changelog for package qt_gui_core
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.8.2 (2024-07-10)
6+
------------------
7+
8+
2.8.1 (2024-06-25)
9+
------------------
10+
511
2.8.0 (2024-04-26)
612
------------------
713

qt_gui_core/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package>
22
<name>qt_gui_core</name>
3-
<version>2.8.0</version>
3+
<version>2.8.2</version>
44
<description>
55
Integration of the ROS package system and ROS-specific plugins for a Qt-based GUI.
66
</description>

qt_gui_cpp/CHANGELOG.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
Changelog for package qt_gui_cpp
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.8.2 (2024-07-10)
6+
------------------
7+
* Add common linters and make them happy to qt_gui_cpp (`#295 <https://github.com/ros-visualization/qt_gui_core/issues/295>`_)
8+
* Deprecated h headers (`#294 <https://github.com/ros-visualization/qt_gui_core/issues/294>`_)
9+
* Contributors: Alejandro Hernández Cordero
10+
11+
2.8.1 (2024-06-25)
12+
------------------
13+
514
2.8.0 (2024-04-26)
615
------------------
716

qt_gui_cpp/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ set(qt_gui_cpp_SRCS
4848
)
4949

5050
set(qt_gui_cpp_HDRS
51-
include/qt_gui_cpp/plugin.h
52-
include/qt_gui_cpp/plugin_bridge.h
53-
include/qt_gui_cpp/plugin_context.h
51+
include/qt_gui_cpp/plugin.hpp
52+
include/qt_gui_cpp/plugin_bridge.hpp
53+
include/qt_gui_cpp/plugin_context.hpp
5454
)
5555

5656
if (${QT_VERSION_MAJOR} GREATER "5")
@@ -97,10 +97,10 @@ install(TARGETS ${PROJECT_NAME}
9797
LIBRARY DESTINATION lib
9898
RUNTIME DESTINATION bin)
9999

100-
# TODO(brawner) add ament_lint_auto tests here. Much of the c++ code needs to
101-
# be updated for ROS2 style
102-
103100
if(BUILD_TESTING)
101+
find_package(ament_lint_auto REQUIRED)
102+
ament_lint_auto_find_test_dependencies()
103+
104104
find_package(ament_cmake_pytest REQUIRED)
105105

106106
if(TARGET qt_gui_cpp_shiboken)

0 commit comments

Comments
 (0)