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 similarity index 100% rename from examples/dbus/remotecontrolledcar/car/car.xml rename to 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 @@ - - - - - - - - - - \ 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