diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-17 03:45:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-17 03:45:04 (GMT) |
| commit | f079ac902cb7b41b02d341ef3497b0ab357079e1 (patch) | |
| tree | 4fcb7507972c34513044b392a61ea9c7aaf04ae6 /src | |
| parent | a08b8d5ddfc90d55f860e5e4fdddebaeebaa6935 (diff) | |
| parent | 93c64e1be3a2d68eb504d7c4f7c60f66ce1ff650 (diff) | |
| download | Qt-f079ac902cb7b41b02d341ef3497b0ab357079e1.zip Qt-f079ac902cb7b41b02d341ef3497b0ab357079e1.tar.gz Qt-f079ac902cb7b41b02d341ef3497b0ab357079e1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix crash on exit when overriding signal handlers in states.
Diffstat (limited to 'src')
| -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); |