1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remotecontrolledcar example: Move car.xml to common directory

Browse Source 
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>
This commit is contained in:
Ievgenii Meshcheriakov 2023-03-13 13:57:11 +01:00
parent 5cd7900d4f
commit 2834d4263a
6 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dbus/remotecontrolledcar/car/CMakeLists.txt
View File

@ -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

2
examples/dbus/remotecontrolledcar/car/car.pro
View File

@ -1,6 +1,6 @@
QT += dbus widgets
DBUS_ADAPTORS += car.xml
DBUS_ADAPTORS += ../common/car.xml
HEADERS += car.h
SOURCES += car.cpp main.cpp

0
examples/dbus/remotecontrolledcar/car/car.xml → examples/dbus/remotecontrolledcar/common/car.xml
View File

2
examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
View File

@ -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
)

11
examples/dbus/remotecontrolledcar/controller/car.xml
View File

@ -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>

2
examples/dbus/remotecontrolledcar/controller/controller.pro
View File

@ -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