diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-19 03:01:28 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-19 03:01:28 (GMT) |
| commit | bfe06c2531fa47d4d417ec22bdb184b06ad0f073 (patch) | |
| tree | d6ac160858673797d7273ca0eb86dcf55e486bfe /src | |
| parent | ab08c7d19ae854a8ffdcc47c9ed4094b593297fa (diff) | |
| parent | d4e35bced214119c7d825eb9d3bd76c1114934ba (diff) | |
| download | Qt-bfe06c2531fa47d4d417ec22bdb184b06ad0f073.zip Qt-bfe06c2531fa47d4d417ec22bdb184b06ad0f073.tar.gz Qt-bfe06c2531fa47d4d417ec22bdb184b06ad0f073.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qmltransitionmanager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp index d1db9ec..ba726db 100644 --- a/src/declarative/util/qmltransitionmanager.cpp +++ b/src/declarative/util/qmltransitionmanager.cpp @@ -236,8 +236,11 @@ void QmlTransitionManager::transition(const QList<Action> &list, action.property.write(action.toValue); } } - if (!transition) + if (!transition) { d->applyBindings(); + if (d->state) + static_cast<QmlStatePrivate*>(QObjectPrivate::get(d->state))->complete(); + } } void QmlTransitionManager::cancel() @@ -262,7 +265,6 @@ void QmlTransitionManager::cancel() } d->bindingsList.clear(); d->completeList.clear(); - } QT_END_NAMESPACE |