summaryrefslogtreecommitdiffstats
path: root/src/corelib/animation/qvariantanimation.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-12-10 10:46:05 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-12-10 10:46:05 (GMT)
commitf22916fe55547f530f31df56e8e49462899688a0 (patch)
treec72e4ec8e5c1e45233e751247f807f5048ca5c74 /src/corelib/animation/qvariantanimation.cpp
parentab5d00edea76d3b1d38d6e7e59159042ec69f2f2 (diff)
parenta2ccf692cdc4113cc90ef12c27ba8c4aa552d81f (diff)
downloadQt-f22916fe55547f530f31df56e8e49462899688a0.zip
Qt-f22916fe55547f530f31df56e8e49462899688a0.tar.gz
Qt-f22916fe55547f530f31df56e8e49462899688a0.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/corelib/animation/qvariantanimation.cpp')
-rw-r--r--src/corelib/animation/qvariantanimation.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index d529f67..bc0d35e 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -373,6 +373,13 @@ QVariantAnimation::~QVariantAnimation()
Another example is QEasingCurve::InOutElastic, which provides an
elastic effect on the values of the interpolated variant.
+ QVariantAnimation will use the QEasingCurve::valueForProgress() to
+ transform the "normalized progress" (currentTime / totalDuration)
+ of the animation into the effective progress actually
+ used by the animation. It is this effective progress that will be
+ the progress when interpolated() is called. Also, the steps in the
+ keyValues are referring to this effective progress.
+
The easing curve is used with the interpolator, the interpolated()
virtual function, the animation's duration, and iterationCount, to
control how the current value changes as the animation progresses.