diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-16 01:19:03 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-16 01:19:03 (GMT) |
| commit | b464dba6efe6593ed6a21511f999868dc78a3e9d (patch) | |
| tree | c9b762af036e5d41ac2262767ccf9f13b298deea /src/declarative | |
| parent | f7c07892e927a6420bb64a7011312f0a4a5a1fc9 (diff) | |
| parent | ade18bab3a2c4c877baa9be2a0012d670dafb64a (diff) | |
| download | Qt-b464dba6efe6593ed6a21511f999868dc78a3e9d.zip Qt-b464dba6efe6593ed6a21511f999868dc78a3e9d.tar.gz Qt-b464dba6efe6593ed6a21511f999868dc78a3e9d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
| -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; } } |