diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-04-23 10:17:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 05:23:34 +0200 |
| commit | 9542511b013588b2ceb132ec8b34879ec904a21e (patch) | |
| tree | 9fe2b2996878c14f61d54561f16ce64bbe096958 /src/qml/qml/qqmlvmemetaobject.cpp | |
| parent | 6d2ed5d0b645f5af383a123e869d061b235b4b85 (diff) | |
Support and use parameters in QQmlNotifierEndpoint.
Allow QQmlNotifierEndpoint to support signals
with parameters. Update QQmlBoundSignal to use
this support.
Change-Id: Ie2a245b39283b0b66d66bd2350e8bc85fe519bb5
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index afcc57e479..d1632820a0 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -127,7 +127,7 @@ class QQmlVMEMetaObjectEndpoint : public QQmlNotifierEndpoint { public: QQmlVMEMetaObjectEndpoint(); - static void vmecallback(QQmlNotifierEndpoint *); + static void vmecallback(QQmlNotifierEndpoint *, void **); void tryConnect(); QFlagPointer<QQmlVMEMetaObject> metaObject; @@ -414,7 +414,7 @@ QQmlVMEMetaObjectEndpoint::QQmlVMEMetaObjectEndpoint() callback = &vmecallback; } -void QQmlVMEMetaObjectEndpoint::vmecallback(QQmlNotifierEndpoint *e) +void QQmlVMEMetaObjectEndpoint::vmecallback(QQmlNotifierEndpoint *e, void **) { QQmlVMEMetaObjectEndpoint *vmee = static_cast<QQmlVMEMetaObjectEndpoint*>(e); vmee->tryConnect(); |