diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-04-03 12:11:55 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-03 09:22:17 +0200 |
commit | 07d3b18a5fc0b6431cafef57c9df22696e27b805 (patch) | |
tree | a3f506ea82b1db0072aec4fad7287612149ecd49 /src/qml/qml/qqmlproperty.cpp | |
parent | 1b6c1c3f85483f1d19375ce44de4e61b7d209f14 (diff) |
Revert "Add QQmlBoundSignalNoParams"
This reverts commit ec7deb3d123bb44b5d57590615a60ed48b1d2860.
Other Qt modules may be relying on QObject::receivers() to
know when there is a QML signal handler for a signal, and
using QQmlNotifierEndpoint in QQmlBoundSignalNoParams breaks
this assumption.
Change-Id: I1b8085254697d909f85a88617eb4e3f258b88950
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlproperty.cpp')
-rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 1b01a7d7c1..14f199c734 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -970,11 +970,7 @@ QQmlPropertyPrivate::setSignalExpression(const QQmlProperty &that, return signalHandler->setExpression(expr); if (expr) { - QQmlAbstractBoundSignal *signal = 0; - if (that.method().parameterTypes().count()) - signal = new QQmlBoundSignal(that.d->object, that.method(), that.d->object); - else - signal = new QQmlBoundSignalNoParams(that.d->object, that.method(), that.d->object); + QQmlBoundSignal *signal = new QQmlBoundSignal(that.d->object, that.method(), that.d->object); QQmlBoundSignalExpression *oldExpr = signal->setExpression(expr); signal->addToObject(); return oldExpr; |