diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-03-13 13:57:11 +0100 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-03-20 17:15:00 +0100 |
| commit | 2834d4263a5c19587076c4edd3621a0daaa81a56 (patch) | |
| tree | 7401017d9d5adfd659209b53958a2a3232e74f8d /examples/dbus | |
| parent | 5cd7900d4f54ee0291017dece003ec06d0d2f831 (diff) | |
remotecontrolledcar example: Move car.xml to common directory
It is shared between car and controller executables.
Task-number: QTBUG-111366
Pick-to: 6.5
Change-Id: I5f98a09664671c55bfad68ebf88c9f0c734511fa
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'examples/dbus')
| -rw-r--r-- | examples/dbus/remotecontrolledcar/car/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/dbus/remotecontrolledcar/car/car.pro | 2 | ||||
| -rw-r--r-- | examples/dbus/remotecontrolledcar/common/car.xml (renamed from examples/dbus/remotecontrolledcar/car/car.xml) | 0 | ||||
| -rw-r--r-- | examples/dbus/remotecontrolledcar/controller/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/dbus/remotecontrolledcar/controller/car.xml | 11 | ||||
| -rw-r--r-- | examples/dbus/remotecontrolledcar/controller/controller.pro | 2 |
6 files changed, 4 insertions, 15 deletions
diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt index b3d47aaecf..3b95730625 100644 --- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt @@ -11,7 +11,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/remotecontrolledcar/car") set(car_SRCS) qt_add_dbus_adaptor(car_SRCS - car.xml + ../common/car.xml qobject.h "" # empty parent_class value on purpose to not pass -l flag car_adaptor diff --git a/examples/dbus/remotecontrolledcar/car/car.pro b/examples/dbus/remotecontrolledcar/car/car.pro index 5e354e3d0b..4c0f2a1eb9 100644 --- a/examples/dbus/remotecontrolledcar/car/car.pro +++ b/examples/dbus/remotecontrolledcar/car/car.pro @@ -1,6 +1,6 @@ QT += dbus widgets -DBUS_ADAPTORS += car.xml +DBUS_ADAPTORS += ../common/car.xml HEADERS += car.h SOURCES += car.cpp main.cpp diff --git a/examples/dbus/remotecontrolledcar/car/car.xml b/examples/dbus/remotecontrolledcar/common/car.xml index 6d8c9d19f2..6d8c9d19f2 100644 --- a/examples/dbus/remotecontrolledcar/car/car.xml +++ b/examples/dbus/remotecontrolledcar/common/car.xml diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt index 44f793b26c..e94d79a634 100644 --- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt @@ -11,7 +11,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/dbus/remotecontrolledcar/controll set(controller_SRCS) qt_add_dbus_interface(controller_SRCS - car.xml + ../common/car.xml car_interface ) diff --git a/examples/dbus/remotecontrolledcar/controller/car.xml b/examples/dbus/remotecontrolledcar/controller/car.xml deleted file mode 100644 index 6d8c9d19f2..0000000000 --- a/examples/dbus/remotecontrolledcar/controller/car.xml +++ /dev/null @@ -1,11 +0,0 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> -<node name="/com/trollech/examples/car"> - <interface name="org.example.Examples.CarInterface"> - <method name="accelerate"/> - <method name="decelerate"/> - <method name="turnLeft"/> - <method name="turnRight"/> - <signal name="crashed"/> - </interface> -</node>
\ No newline at end of file diff --git a/examples/dbus/remotecontrolledcar/controller/controller.pro b/examples/dbus/remotecontrolledcar/controller/controller.pro index 07767141f4..eddcbdefdf 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.pro +++ b/examples/dbus/remotecontrolledcar/controller/controller.pro @@ -1,6 +1,6 @@ QT += dbus widgets -DBUS_INTERFACES += car.xml +DBUS_INTERFACES += ../common/car.xml FORMS += controller.ui HEADERS += controller.h SOURCES += main.cpp controller.cpp |