summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativestate_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-11-02 00:41:25 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-11-02 00:41:25 (GMT)
commit155065cd5c611e2d14357a8ff3180ac14a68e3a0 (patch)
tree2d5717696a035e107ecd28e097726170f9ffd387 /src/declarative/util/qdeclarativestate_p.h
parentd194ebdc199fdd85245bfecb766d836dfa79c3f3 (diff)
downloadQt-155065cd5c611e2d14357a8ff3180ac14a68e3a0.zip
Qt-155065cd5c611e2d14357a8ff3180ac14a68e3a0.tar.gz
Qt-155065cd5c611e2d14357a8ff3180ac14a68e3a0.tar.bz2
Removing a binding while it is being applied caused a crash.
Use a weak pointer to the binding in case applying the binding (while fast forwarding) causes it to be removed. Task-number: QTBUG-14830 Reviewed-by: Michael Brasser
Diffstat (limited to 'src/declarative/util/qdeclarativestate_p.h')
-rw-r--r--src/declarative/util/qdeclarativestate_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index fc7c940..7b9c18a 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -45,6 +45,7 @@
#include <qdeclarative.h>
#include <qdeclarativeproperty.h>
#include <QtCore/qobject.h>
+#include <private/qdeclarativebinding_p.h>
#include <private/qdeclarativeglobal_p.h>
QT_BEGIN_HEADER
@@ -75,7 +76,7 @@ public:
QVariant toValue;
QDeclarativeAbstractBinding *fromBinding;
- QDeclarativeAbstractBinding *toBinding;
+ QDeclarativeAbstractBinding::Pointer toBinding;
QDeclarativeActionEvent *event;
//strictly for matching