From c421281a0291fd48c616a6e37315364ce0553c0f Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Sun, 3 Jun 2012 21:10:32 +0200 Subject: Adapt to connection-related changes in qtbase The QQmlData hooks signalEmitted() and receivers() now receive the index in the signal index range (i.e., excluding non-signal methods). This was done to avoid Q(Meta)Object having to compute the class's method offset; the signal offset should be sufficient for everyone. This required adapting QQmlNotifier, QQmlBoundSignal, QQmlPropertyCache and friends to use the signal index range whenever a property's notify signal is involved in the internal connection lists and property captures. Using the signal index range also reduces the memory used for NotifyList::notifies, since useless entries for non-signal methods will no longer be created. Change-Id: I62872fbea5a1f829b8b03bae3fc1e6acd84cf886 Reviewed-by: Aaron Kennedy --- src/quick/util/qquickconnections.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quick/util') diff --git a/src/quick/util/qquickconnections.cpp b/src/quick/util/qquickconnections.cpp index 6a20e31821..be3d9539c5 100644 --- a/src/quick/util/qquickconnections.cpp +++ b/src/quick/util/qquickconnections.cpp @@ -279,7 +279,7 @@ void QQuickConnections::connectSignals() QQmlProperty prop(target(), propName); if (prop.isValid() && (prop.type() & QQmlProperty::SignalProperty)) { QQmlBoundSignal *signal = - new QQmlBoundSignal(target(), prop.index(), this, qmlEngine(this)); + new QQmlBoundSignal(target(), QQmlPropertyPrivate::get(prop)->signalIndex(), this, qmlEngine(this)); QString location; QQmlContextData *ctxtdata = 0; -- cgit v1.2.3