diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-07-21 00:52:08 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-26 06:31:36 (GMT) |
| commit | 6ff23f2b2d96e852ed1fff0ecef0e8ee28ec82e7 (patch) | |
| tree | 421ba770d03663807309d3642786f56ed79fda39 /src/declarative/util | |
| parent | be4b912cb5068db2ba40e85c4857e907768264b8 (diff) | |
| download | Qt-6ff23f2b2d96e852ed1fff0ecef0e8ee28ec82e7.zip Qt-6ff23f2b2d96e852ed1fff0ecef0e8ee28ec82e7.tar.gz Qt-6ff23f2b2d96e852ed1fff0ecef0e8ee28ec82e7.tar.bz2 | |
Only ignore the same target value for a Behavior when it is running.
Otherwise a Behavior may mistakenly not be triggered. This situation
can arise when the property in question has been manipulated via the
property system, followed by a direct function call (which correctly
bypasses the Behavior), followed by a another change via the property
system.
Task-number: QTBUG-12295
(cherry picked from commit 64833c0a648211f3fe7547436f022edc0ceb51ac)
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativebehavior.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp index 4480e75..525df30 100644 --- a/src/declarative/util/qdeclarativebehavior.cpp +++ b/src/declarative/util/qdeclarativebehavior.cpp @@ -186,7 +186,7 @@ void QDeclarativeBehavior::write(const QVariant &value) return; } - if (value == d->targetValue) + if (d->animation->isRunning() && value == d->targetValue) return; d->currentValue = d->property.read(); |