diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-13 11:53:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-13 11:53:03 (GMT) |
| commit | 68f38d73d3565a6e59fd60ba61584ebd0b187129 (patch) | |
| tree | e0eb3277304e631b4a144c2d00fef281c14efa26 /src | |
| parent | ee62807198a2525577c14f718b98d07ae0ec7bec (diff) | |
| parent | ade18bab3a2c4c877baa9be2a0012d670dafb64a (diff) | |
| download | Qt-68f38d73d3565a6e59fd60ba61584ebd0b187129.zip Qt-68f38d73d3565a6e59fd60ba61584ebd0b187129.tar.gz Qt-68f38d73d3565a6e59fd60ba61584ebd0b187129.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:
Add autotest that checks that copy and cut don't work when echomode is set to hide text/password mode
Clear previous animation data for non-triggering animations.
Fix configure -help output. declarative module is built by default.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index a747706..2fca09d 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -2392,6 +2392,8 @@ void QDeclarativePropertyAnimation::transition(QDeclarativeStateActions &actions d->actions = &data->actions; } else { delete data; + d->va->setFromSourcedValue(0); //clear previous data + d->va->setAnimValue(0, QAbstractAnimation::DeleteWhenStopped); //clear previous data d->actions = 0; } } |