diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-07-21 00:52:08 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-07-21 00:58:36 (GMT) |
| commit | 64833c0a648211f3fe7547436f022edc0ceb51ac (patch) | |
| tree | 9c1fa421a03a5954a2bbfe2f34936e0991bc1026 /src/declarative/util/qdeclarativebehavior.cpp | |
| parent | 6d8b3453b6b4b151c777ad541ab25ca6bacc7381 (diff) | |
| download | Qt-64833c0a648211f3fe7547436f022edc0ceb51ac.zip Qt-64833c0a648211f3fe7547436f022edc0ceb51ac.tar.gz Qt-64833c0a648211f3fe7547436f022edc0ceb51ac.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
Diffstat (limited to 'src/declarative/util/qdeclarativebehavior.cpp')
| -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 3719085..fadb2ae 100644 --- a/src/declarative/util/qdeclarativebehavior.cpp +++ b/src/declarative/util/qdeclarativebehavior.cpp @@ -177,7 +177,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(); |