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/v4 | |
| 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/v4')
| -rw-r--r-- | src/qml/qml/v4/qv4bindings.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/v4/qv4bindings_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v4/qv4bindings.cpp b/src/qml/qml/v4/qv4bindings.cpp index db6811f74f..5bb993fa6c 100644 --- a/src/qml/qml/v4/qv4bindings.cpp +++ b/src/qml/qml/v4/qv4bindings.cpp @@ -288,7 +288,7 @@ QObject *QV4Bindings::Binding::object() const return target; } -void QV4Bindings::Subscription::subscriptionCallback(QQmlNotifierEndpoint *e) +void QV4Bindings::Subscription::subscriptionCallback(QQmlNotifierEndpoint *e, void **) { Subscription *s = static_cast<Subscription *>(e); s->bindings->subscriptionNotify(s->method); diff --git a/src/qml/qml/v4/qv4bindings_p.h b/src/qml/qml/v4/qv4bindings_p.h index 3a7d175d7b..78a3f9bab3 100644 --- a/src/qml/qml/v4/qv4bindings_p.h +++ b/src/qml/qml/v4/qv4bindings_p.h @@ -112,7 +112,7 @@ private: { public: Subscription() : bindings(0), method(-1) { callback = &subscriptionCallback; } - static void subscriptionCallback(QQmlNotifierEndpoint *e); + static void subscriptionCallback(QQmlNotifierEndpoint *e, void**); QV4Bindings *bindings; int method; }; |