diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-11-09 14:28:41 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-09 08:23:57 +0100 |
| commit | 6a01c81dffe3122138bb9708166c1701059f01fa (patch) | |
| tree | ac97140053d7c447d97fd611324a0ecabf474a6c /src/qtquick1 | |
| parent | fbd689be06c426ba27545b3fb0f6ddd9865565d9 (diff) | |
Fix crash on exit when overriding signal handlers in states.
Cherry-picked from 93c64e1be3a2d68eb504d7c4f7c60f66ce1ff650 in 4.7.
Task-number: QTBUG-21617
Change-Id: I99ce8292d53954f5229867a384f47bedf7fad315
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qtquick1')
| -rw-r--r-- | src/qtquick1/util/qdeclarativepropertychanges.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qtquick1/util/qdeclarativepropertychanges.cpp b/src/qtquick1/util/qdeclarativepropertychanges.cpp index 692d7bbb60..3ea22e83fc 100644 --- a/src/qtquick1/util/qdeclarativepropertychanges.cpp +++ b/src/qtquick1/util/qdeclarativepropertychanges.cpp @@ -174,7 +174,8 @@ public: reverseExpression = rewindExpression; } - /*virtual void copyOriginals(QDeclarative1ActionEvent *other) + virtual bool needsCopy() { return true; } + virtual void copyOriginals(QDeclarative1ActionEvent *other) { QDeclarative1ReplaceSignalHandler *rsh = static_cast<QDeclarative1ReplaceSignalHandler*>(other); saveCurrentValues(); @@ -185,7 +186,7 @@ public: ownedExpression = rsh->ownedExpression; rsh->ownedExpression = 0; } - }*/ + } virtual void rewind() { ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression); |