diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-07-21 01:34:18 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-07-21 01:34:18 (GMT) |
| commit | 4e193343630db3c3efaa67670e73e2b5a89cf69a (patch) | |
| tree | db33b3194e2dd66d921b43c6e3a3a8342e596451 /src/declarative/util | |
| parent | c2c28428123cfd3a3994117bfea88a0ae68f6884 (diff) | |
| parent | 64833c0a648211f3fe7547436f022edc0ceb51ac (diff) | |
| download | Qt-4e193343630db3c3efaa67670e73e2b5a89cf69a.zip Qt-4e193343630db3c3efaa67670e73e2b5a89cf69a.tar.gz Qt-4e193343630db3c3efaa67670e73e2b5a89cf69a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativebehavior.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations.cpp | 8 |
2 files changed, 7 insertions, 3 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(); diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 5590449..2291c16 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -1501,8 +1501,12 @@ void QDeclarativeAnchorChanges::rewind() d->target->setX(d->rewindX); d->target->setY(d->rewindY); - d->target->setWidth(d->rewindWidth); - d->target->setHeight(d->rewindHeight); + if (targetPrivate->widthValid) { + d->target->setWidth(d->rewindWidth); + } + if (targetPrivate->heightValid) { + d->target->setHeight(d->rewindHeight); + } } void QDeclarativeAnchorChanges::saveCurrentValues() |