summaryrefslogtreecommitdiffstats
path: root/src/serviceframework
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2013-10-04 00:19:33 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-06 23:45:28 +0200
commit7f14d89f022c9120bbe637daa319fd04672b85e5 (patch)
tree913aa6a8485b44f72dc2507bc175e9c3e413d0eb /src/serviceframework
parent26ed19484e85fb814d2735fa4a98f1ad4c51199b (diff)
Fix method invocations with both custom and standard param types
Prior to this fix, method calls would only work if the method's parameters were either just standard Qt types or just custom types. Any combination would lead to a failure invoking the method. Change-Id: I6f140767dfec1692ba7d766284f39916057cd017 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/serviceframework')
-rw-r--r--src/serviceframework/ipc/qservicemetaobject_dbus.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/serviceframework/ipc/qservicemetaobject_dbus.cpp b/src/serviceframework/ipc/qservicemetaobject_dbus.cpp
index f6a9ca78..5e51c1cf 100644
--- a/src/serviceframework/ipc/qservicemetaobject_dbus.cpp
+++ b/src/serviceframework/ipc/qservicemetaobject_dbus.cpp
@@ -448,6 +448,9 @@ int QServiceMetaObjectDBus::qt_metacall(QMetaObject::Call c, int id, void **a)
typeNames[i] = customType->typeName();
params[i] = customType->constData();
hasCustomType = true;
+ } else {
+ typeNames[i] = t.constData();
+ params[i] = a[i+1];
}
}