diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-09-30 03:33:56 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-10-17 03:28:15 (GMT) |
| commit | 93c64e1be3a2d68eb504d7c4f7c60f66ce1ff650 (patch) | |
| tree | bafc428413d2391c217c0fc1cebbc16e6ebf5e7b /src/declarative | |
| parent | 61f165239c4e87a8f6bcd594553b8fcea1a7f8d0 (diff) | |
| download | Qt-93c64e1be3a2d68eb504d7c4f7c60f66ce1ff650.zip Qt-93c64e1be3a2d68eb504d7c4f7c60f66ce1ff650.tar.gz Qt-93c64e1be3a2d68eb504d7c4f7c60f66ce1ff650.tar.bz2 | |
Fix crash on exit when overriding signal handlers in states.
Change-Id: I0e73948f18aa1b78c7e92677167673b84a90a450
Task-number: QTBUG-21617
Reviewed-by: Martin Jones
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/util/qdeclarativepropertychanges.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index 5cdf785..f86274f 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -171,7 +171,8 @@ public: reverseExpression = rewindExpression; } - /*virtual void copyOriginals(QDeclarativeActionEvent *other) + virtual bool needsCopy() { return true; } + virtual void copyOriginals(QDeclarativeActionEvent *other) { QDeclarativeReplaceSignalHandler *rsh = static_cast<QDeclarativeReplaceSignalHandler*>(other); saveCurrentValues(); @@ -182,7 +183,7 @@ public: ownedExpression = rsh->ownedExpression; rsh->ownedExpression = 0; } - }*/ + } virtual void rewind() { ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression); |