summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeonardo Sobral Cunha <leo.cunha@nokia.com>2010-03-31 08:31:08 (GMT)
committerLeonardo Sobral Cunha <leo.cunha@nokia.com>2010-04-08 05:06:10 (GMT)
commit20f614ccfa7657da7e9d585de34c578cef659920 (patch)
treed9611cea89ca7475c360a1e93d8251fe2c07c0ee /src
parentbcb8c932aa10cd207850a8bfcdd12d90d440f18a (diff)
downloadQt-20f614ccfa7657da7e9d585de34c578cef659920.zip
Qt-20f614ccfa7657da7e9d585de34c578cef659920.tar.gz
Qt-20f614ccfa7657da7e9d585de34c578cef659920.tar.bz2
Fix doc of qml's SmoothedAnimation
Diffstat (limited to 'src')
-rw-r--r--src/declarative/util/qdeclarativesmoothedanimation.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index 21a8be2..f21b0c7 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -248,13 +248,14 @@ void QSmoothedAnimation::init()
/*!
\qmlclass SmoothedAnimation QDeclarativeSmoothedAnimation
\since 4.7
+ \inherits NumberAnimation
\brief The SmoothedAnimation element allows a property to smoothly track a value.
- The SmoothedAnimation smoothly animates a property's value to a set target value
+ The SmoothedAnimation animates a property's value to a set target value
using an ease in/out quad easing curve. If the animation is restarted
with a different target value, the easing curves used to animate to the old
- and the new target values are spliced together to avoid any obvious visual
- glitches.
+ and the new target values are smoothly spliced together to avoid any obvious
+ visual glitches by maintaining the current velocity.
The property animation is configured by setting the velocity at which the
animation should occur, or the duration that the animation should take.
@@ -454,14 +455,14 @@ void QDeclarativeSmoothedAnimation::setVelocity(qreal v)
}
/*!
-\qmlproperty qreal SmoothedAnimation::maximumEasingTime
+ \qmlproperty qreal SmoothedAnimation::maximumEasingTime
-This property specifies the maximum time, in msecs, an "eases" during the follow should take.
-Setting this property causes the velocity to "level out" after at a time. Setting
-a negative value reverts to the normal mode of easing over the entire animation
-duration.
+ This property specifies the maximum time, in msecs, an "eases" during the follow should take.
+ Setting this property causes the velocity to "level out" after at a time. Setting
+ a negative value reverts to the normal mode of easing over the entire animation
+ duration.
-The default value is -1.
+ The default value is -1.
*/
int QDeclarativeSmoothedAnimation::maximumEasingTime() const
{