diff options
| -rw-r--r-- | examples/dbus/remotecontrolledcar/car/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/dbus/Qt6DBusMacros.cmake | 12 | ||||
| -rw-r--r-- | src/dbus/doc/src/qtdbus-cmake.qdoc | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt index 142268c1ce..63b047484d 100644 --- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt @@ -24,8 +24,8 @@ find_package(Qt6 COMPONENTS Widgets) set(car_SRCS) qt6_add_dbus_adaptor(car_SRCS car.xml - car.h - Car + qobject.h + "" # empty parent_class value on purpose to not pass -l flag car_adaptor ) # special case end diff --git a/src/dbus/Qt6DBusMacros.cmake b/src/dbus/Qt6DBusMacros.cmake index d7bba30148..76079a5816 100644 --- a/src/dbus/Qt6DBusMacros.cmake +++ b/src/dbus/Qt6DBusMacros.cmake @@ -152,9 +152,15 @@ if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) endif() -function(qt6_add_dbus_adaptor _sources _xml_file _include _parentClass) # _optionalBasename _optionalClassName) +function(qt6_add_dbus_adaptor _sources _xml_file _include) # _optionalParentClass _optionalBasename _optionalClassName) get_filename_component(_infile ${_xml_file} ABSOLUTE) + set(_optionalParentClass "${ARGV3}") + if(_optionalParentClass) + set(_parentClassOption "-l") + set(_parentClass "${_optionalParentClass}") + endif() + set(_optionalBasename "${ARGV4}") if(_optionalBasename) set(_basename ${_optionalBasename} ) @@ -170,13 +176,13 @@ function(qt6_add_dbus_adaptor _sources _xml_file _include _parentClass) # _optio if(_optionalClassName) add_custom_command(OUTPUT "${_impl}" "${_header}" - COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile} + COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -c ${_optionalClassName} -i ${_include} ${_parentClassOption} ${_parentClass} ${_infile} DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml VERBATIM ) else() add_custom_command(OUTPUT "${_impl}" "${_header}" - COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -i ${_include} -l ${_parentClass} ${_infile} + COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -i ${_include} ${_parentClassOption} ${_parentClass} ${_infile} DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml VERBATIM ) diff --git a/src/dbus/doc/src/qtdbus-cmake.qdoc b/src/dbus/doc/src/qtdbus-cmake.qdoc index de127fa9f4..7130e4a262 100644 --- a/src/dbus/doc/src/qtdbus-cmake.qdoc +++ b/src/dbus/doc/src/qtdbus-cmake.qdoc @@ -183,7 +183,8 @@ arguments to the tool can be set after \c{OPTIONS}. \section1 Synopsis \badcode -qt5_add_dbus_adaptor(<VAR> dbus_spec header parent_class +qt5_add_dbus_adaptor(<VAR> dbus_spec header + [parent_class] [basename] [classname]) \endcode |