summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusmisc.cpp
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-03-15 12:57:25 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-15 19:36:01 +0100
commite640c3bcfefe02261cfa74227128da70837cc834 (patch)
treedc0fff70da401e15c4adea98c839d6b14fee1128 /src/dbus/qdbusmisc.cpp
parent43a176804fbfae86e3bccb7f1a84816d4ae9c7ff (diff)
Make more of QDBus bootstrapping-ready.
The DBus metatype system and marshaller is required for determining the dbus-signature of built-in Qt types, for example QPoint. Change-Id: I8860ab3b88827aeb8063dfb79c4a9b28c0a20c0f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusmisc.cpp')
-rw-r--r--src/dbus/qdbusmisc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp
index 5b20511422..fa9b74199e 100644
--- a/src/dbus/qdbusmisc.cpp
+++ b/src/dbus/qdbusmisc.cpp
@@ -132,7 +132,6 @@ bool qDBusInterfaceInObject(QObject *obj, const QString &interface_name)
// sig must be the normalised signature for the method
int qDBusParametersForMethod(const QMetaMethod &mm, QList<int>& metaTypes)
{
- QDBusMetaTypeId::init();
return qDBusParametersForMethod(mm.parameterTypes(), metaTypes);
}
@@ -140,6 +139,7 @@ int qDBusParametersForMethod(const QMetaMethod &mm, QList<int>& metaTypes)
int qDBusParametersForMethod(const QList<QByteArray> &parameterTypes, QList<int>& metaTypes)
{
+ QDBusMetaTypeId::init();
metaTypes.clear();
metaTypes.append(0); // return type