summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusconnection_p.h
diff options
context:
space:
mode:
authorKevron Rees <kevron.m.rees@intel.com>2015-01-22 15:00:36 -0800
committerThiago Macieira <thiago.macieira@intel.com>2015-02-15 02:17:53 +0000
commit0eec8c86b604374c3210133822d41df229698b34 (patch)
treeef38b6a2def0b285aa35b57c52fbbe14263640a2 /src/dbus/qdbusconnection_p.h
parent06ecd74db138bcdf6f87df5917f6d5035da41823 (diff)
QDBusConnection::registorObject with interface
Currently QDBus relies on a key in QMetaClassInfo to understand the DBus interface name. This patch allows QDBus to also use a specified interface name in the registerObject call instead of relying on QMetaClassInfo that might not be there (if the QObject was created in QML or Javascript for example). Change-Id: Ie02b2c67e7deb07f43e35eb166c11833fcbf38f3 Task-number: QTBUG-44074 Reviewed-by: Kevron Rees <kevron.m.rees@intel.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusconnection_p.h')
-rw-r--r--src/dbus/qdbusconnection_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index 29c4d6869c..5d8777c622 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -152,6 +152,7 @@ public:
{ return obj || !children.isEmpty(); }
QString name;
+ QString interfaceName;
union {
QObject *obj;
QDBusVirtualObject *treeNode;