aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlnotifier.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-04-23 10:17:57 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-23 05:23:34 +0200
commit9542511b013588b2ceb132ec8b34879ec904a21e (patch)
tree9fe2b2996878c14f61d54561f16ce64bbe096958 /src/qml/qml/qqmlnotifier.cpp
parent6d2ed5d0b645f5af383a123e869d061b235b4b85 (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/qqmlnotifier.cpp')
-rw-r--r--src/qml/qml/qqmlnotifier.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlnotifier.cpp b/src/qml/qml/qqmlnotifier.cpp
index 270eee52b4..1ed3a2957d 100644
--- a/src/qml/qml/qqmlnotifier.cpp
+++ b/src/qml/qml/qqmlnotifier.cpp
@@ -44,20 +44,20 @@
QT_BEGIN_NAMESPACE
-void QQmlNotifier::emitNotify(QQmlNotifierEndpoint *endpoint)
+void QQmlNotifier::emitNotify(QQmlNotifierEndpoint *endpoint, void **a)
{
QQmlNotifierEndpoint **oldDisconnected = endpoint->disconnected;
endpoint->disconnected = &endpoint;
endpoint->notifying = 1;
if (endpoint->next)
- emitNotify(endpoint->next);
+ emitNotify(endpoint->next, a);
if (endpoint) {
Q_ASSERT(endpoint->callback);
- endpoint->callback(endpoint);
+ endpoint->callback(endpoint, a);
if (endpoint)
endpoint->disconnected = oldDisconnected;