diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-14 21:53:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-23 14:51:17 +0100 |
| commit | d641008d04475bfb1c1996e408b1408618845b6f (patch) | |
| tree | 537abe3f4f6751c3a41f460546782c483a9bdc8e /src/qml/qml/qqmlpropertycache.cpp | |
| parent | c9adc7661a7eef4f2eefb51f02c0393be2ec3898 (diff) | |
Prepare method invocation in QObject bindings for gadget support
In order to support calling invokable methods in gadgets from JavaScript, the
wrapper code needs to be able to operate on gadgets and not only QObject
pointers. The minimal abstraction for that - QQmlGadgetOrObject - is passed
through the relevant invocation methods in the wrapper for that.
Change-Id: I94f939c942241f49dce4d32d05bf24822b2d331b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlpropertycache.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 74a24f81fc..9191f26a28 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -1653,4 +1653,12 @@ int *QQmlMetaObject::methodParameterTypes(int index, QVarLengthArray<int, 9> &du } } +void QQmlObjectOrGadget::metacall(QMetaObject::Call type, int index, void **argv) const +{ + if (ptr.isT1()) + QMetaObject::metacall(ptr.asT1(), type, index, argv); + else + _m.asT1()->metaObject()->d.static_metacall(reinterpret_cast<QObject*>(ptr.asT2()), type, index, argv); +} + QT_END_NAMESPACE |