diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-04-26 16:12:21 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-01 06:07:00 +0200 |
| commit | 462edd23f953af6ce37d1c42400e2cb4443f5a24 (patch) | |
| tree | ef505e16ad6e7a439a6217da191fdaac6d9eda3c /src/qml/qml/qqmlproperty_p.h | |
| parent | 7cecad76b6a8beb31c74111b986be0e67bb2e15c (diff) | |
More robust tracking of signal handler expression ownership.
Reference count the expressions, and improve testing.
Change-Id: I810509eae1c7608b367e9ff5f7891a294667a692
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlproperty_p.h')
| -rw-r--r-- | src/qml/qml/qqmlproperty_p.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlproperty_p.h b/src/qml/qml/qqmlproperty_p.h index e33c95ae41..cba7849ea0 100644 --- a/src/qml/qml/qqmlproperty_p.h +++ b/src/qml/qml/qqmlproperty_p.h @@ -60,11 +60,11 @@ #include <private/qtqmlglobal_p.h> #include <private/qqmlpropertycache_p.h> #include <private/qqmlguard_p.h> +#include <private/qqmlboundsignalexpressionpointer_p.h> QT_BEGIN_NAMESPACE class QQmlContext; -class QQmlBoundSignalExpression; class QQmlEnginePrivate; class QQmlJavaScriptExpression; class Q_QML_PRIVATE_EXPORT QQmlPropertyPrivate : public QQmlRefCount @@ -141,8 +141,10 @@ public: QQmlAbstractBinding *, WriteFlags flags = DontRemoveBinding); static QQmlBoundSignalExpression *signalExpression(const QQmlProperty &that); - static QQmlBoundSignalExpression *setSignalExpression(const QQmlProperty &that, - QQmlBoundSignalExpression *) ; + static QQmlBoundSignalExpressionPointer setSignalExpression(const QQmlProperty &that, + QQmlBoundSignalExpression *); + static QQmlBoundSignalExpressionPointer takeSignalExpression(const QQmlProperty &that, + QQmlBoundSignalExpression *); static bool write(const QQmlProperty &that, const QVariant &, WriteFlags); static bool writeBinding(QObject *, const QQmlPropertyData &, QQmlContextData *context, |