projects
/
web/konrad/DeclarativeWidgets.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
df99bbe
)
Invoke slots of proxied objects correctly
author
Tobias Koenig
<tobias.koenig@kdab.com>
Wed, 17 Oct 2012 17:14:24 +0000 (19:14 +0200)
committer
Tobias Koenig
<tobias.koenig@kdab.com>
Wed, 17 Oct 2012 17:14:24 +0000 (19:14 +0200)
declarativeobjects.cpp
patch
|
blob
|
history
diff --git
a/declarativeobjects.cpp
b/declarativeobjects.cpp
index
c1d8f99
..
e25b3da
100644
(file)
--- a/
declarativeobjects.cpp
+++ b/
declarativeobjects.cpp
@@
-42,7
+42,10
@@
int ClassName::qt_metacall(QMetaObject::Call call, int id, void **argv) \
if (id < 0) \
return 0; \
} else if (call == QMetaObject::InvokeMetaMethod) {\
- QMetaObject::activate(this, id, argv); \
+ if (ClassName::staticMetaObject.method(id).methodType() == QMetaMethod::Signal) \
+ QMetaObject::activate(this, id, argv); \
+ else \
+ id = m_proxiedObject->qt_metacall(call, id, argv); \
id -= 1; \
} \
return id; \