diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-19 12:01:35 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-19 12:01:35 (GMT) |
| commit | 28e9d6f341278feb26b6594f18285e1d50cd76c6 (patch) | |
| tree | e357ca484578e9a3dee7d8a0ba3a6084b8b8f737 /src/declarative | |
| parent | 20d1a78e07e74ff7518e040c6fbd32e4609ca7fc (diff) | |
| parent | 2ac290f56c6ad4f3e236034a7b99ecdb598ecc3a (diff) | |
| download | Qt-28e9d6f341278feb26b6594f18285e1d50cd76c6.zip Qt-28e9d6f341278feb26b6594f18285e1d50cd76c6.tar.gz Qt-28e9d6f341278feb26b6594f18285e1d50cd76c6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index 5f81b26..27f37df 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -1748,7 +1748,8 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t) \brief the easing curve used for the animation. To specify an easing curve you need to specify at least the type. For some curves you can also specify - amplitude, period and/or overshoot (more details provided after the table). + amplitude, period and/or overshoot (more details provided after the table). The default easing curve is + Linear. \qml PropertyAnimation { properties: "y"; easing.type: "InOutElastic"; easing.amplitude: 2.0; easing.period: 1.5 } |