From 97a4843c61a4f0829f4b18dec2b98c51a3d67ab2 Mon Sep 17 00:00:00 2001 From: "Daniele E. Domenichelli" Date: Thu, 21 Jun 2012 20:41:27 +0200 Subject: qtdbus: Export org.freedesktop.DBus.Peer interface when introspected The ofD.Peer interface is automatically implemented when an object is registered on DBus, but the ofD.Introspectable.Introspect method does not show it. You can test it by running $ qdbus --literal \ > org.freedesktop.DBus.Peer.Ping $ qdbus --literal \ > org.freedesktop.DBus.Peer.GetMachineId Change-Id: I7062ba0cdae486d443011ee19cf3874aabf90205 (cherry picked from commit 7767eed7d678dbd51d3857e6d8353f249ab5487a) Reviewed-by: Thiago Macieira --- src/dbus/qdbusinternalfilters.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp index 58f079b..f734458 100644 --- a/src/dbus/qdbusinternalfilters.cpp +++ b/src/dbus/qdbusinternalfilters.cpp @@ -92,6 +92,14 @@ static const char propertiesInterfaceXml[] = " \n" " \n"; +static const char peerInterfaceXml[] = + " \n" + " \n" + " \n" + " \n" + " \n" + " \n"; + static QString generateSubObjectXml(QObject *object) { QString retval; @@ -165,6 +173,7 @@ QString qDBusIntrospectObject(const QDBusConnectionPrivate::ObjectTreeNode &node } xml_data += QLatin1String( introspectableInterfaceXml ); + xml_data += QLatin1String( peerInterfaceXml ); if (node.flags & QDBusConnection::ExportChildObjects) { xml_data += generateSubObjectXml(node.obj); -- cgit v0.12