diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2010-02-04 03:39:58 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2010-02-04 03:39:58 (GMT) |
commit | 4c8b9316de5728276d24f2d72599cf9c6534fced (patch) | |
tree | b726d4826db4d98fd355f0c2c8a69229cf790b6a /src/declarative/util/qmlanimation.cpp | |
parent | 0b8ef5c78b724901cfae343920b3e9e8f4a78fda (diff) | |
parent | e1c72879ed2c25819537bc5bbb12569b705ba79f (diff) | |
download | Qt-4c8b9316de5728276d24f2d72599cf9c6534fced.zip Qt-4c8b9316de5728276d24f2d72599cf9c6534fced.tar.gz Qt-4c8b9316de5728276d24f2d72599cf9c6534fced.tar.bz2 |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlanimation.cpp')
-rw-r--r-- | src/declarative/util/qmlanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 63044bc..74f5b3a 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -1762,7 +1762,7 @@ void QmlPropertyAnimation::setTo(const QVariant &t) \table \row - \o \c easeNone + \o \c easeLinear \o Easing curve for a linear (t) function: velocity is constant. \o \inlineimage qeasingcurve-linear.png \row |