path: root/src/dbus/qdbusinterface.cpp
diff options
authorKent Hansen <>2012-02-19 13:25:04 +0100
committerQt by Nokia <>2012-02-29 12:50:14 +0100
commit3b844c16e0988b017c67b2329cbe34d4da112b33 (patch)
tree8635c99500e01aaf938de45ff98c76034fec5276 /src/dbus/qdbusinterface.cpp
parent019a5f2dd50404abfb06f26d31aa6292eb6344fc (diff)
Port QDBusMetaObject to Qt5 meta-property/method descriptor format
Adapts QDBusMetaObject to be in sync with the moc/meta-object changes for property and method descriptors (storing the name and argument count of methods, and more elaborate type information). Now that the method name is stored in the standard method descriptor, QtDBus doesn't need to store it separately anymore, and the QMetaObjectPrivate::rawStringData() function can be removed. Change-Id: I04efdbe05b52bbd85405e1713509e55308ac42da Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/dbus/qdbusinterface.cpp')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp
index d390f395ee..b76dd733a2 100644
--- a/src/dbus/qdbusinterface.cpp
+++ b/src/dbus/qdbusinterface.cpp
@@ -280,7 +280,7 @@ int QDBusInterfacePrivate::metacall(QMetaObject::Call c, int id, void **argv)
} else if (mm.methodType() == QMetaMethod::Slot || mm.methodType() == QMetaMethod::Method) {
// method call relay from Qt world to D-Bus world
// get D-Bus equivalent signature
- QString methodName = QLatin1String(metaObject->dbusNameForMethod(id));
+ QString methodName = QString::fromLatin1(;
const int *inputTypes = metaObject->inputTypesForMethod(id);
int inputTypesCount = *inputTypes;