Skip to content

Commit 04f1d5d

Browse files
ahcordeahcorde
authored
Merge branch 'rolling' into ahcorde/rolling/qt6
2 parents 978dce2 + 93dc7e3 commit 04f1d5d

Some content is hidden

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

57 files changed

+1425
-892
lines changed

‎qt_dotgraph/CHANGELOG.rst

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

5+
2.8.1 (2024-06-25)
6+
------------------
7+
* Skip running the tests on Windows Debug. (`#292 <https://github.com/ros-visualization/qt_gui_core/issues/292>`_)
8+
* Contributors: Chris Lalancette
9+
510
2.8.0 (2024-04-26)
611
------------------
712

‎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.1</version>
44
<description>
55
qt_dotgraph provides helpers to work with dot graphs.
66
</description>

‎qt_gui/CHANGELOG.rst

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

5+
2.8.1 (2024-06-25)
6+
------------------
7+
58
2.8.0 (2024-04-26)
69
------------------
710

‎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.1</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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package qt_gui_app
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.8.1 (2024-06-25)
6+
------------------
7+
58
2.8.0 (2024-04-26)
69
------------------
710

‎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.1</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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package qt_gui_core
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.8.1 (2024-06-25)
6+
------------------
7+
58
2.8.0 (2024-04-26)
69
------------------
710

‎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.1</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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package qt_gui_cpp
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.8.1 (2024-06-25)
6+
------------------
7+
58
2.8.0 (2024-04-26)
69
------------------
710

‎qt_gui_cpp/CMakeLists.txt

Lines changed: 3 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,9 +97,6 @@ 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)
104101
find_package(ament_cmake_pytest REQUIRED)
105102

0 commit comments

Comments
 (0)