diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-14 23:22:47 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-14 23:22:47 (GMT) |
| commit | d5008095e7c35bda927f0c41aa4545ddbbcc52b9 (patch) | |
| tree | b19d7a7f24e2c4e175e4c2d761909150be88cc46 /src/declarative | |
| parent | 99c3ba94e985520f1095532fa930f0f0591d407c (diff) | |
| parent | 2d0a93bd816b7cfce41acf37da479758c175aa7a (diff) | |
| download | Qt-d5008095e7c35bda927f0c41aa4545ddbbcc52b9.zip Qt-d5008095e7c35bda927f0c41aa4545ddbbcc52b9.tar.gz Qt-d5008095e7c35bda927f0c41aa4545ddbbcc52b9.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index d77ef40..652d359 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -1883,7 +1883,7 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t) For the easing you can specify the following parameters: type, amplitude, period and overshoot. \qml - PropertyAnimation { properties: "y"; easing.type: "InOutElastc"; easing.amplitude: 2.0; easing.period: 1.5 } + PropertyAnimation { properties: "y"; easing.type: "InOutElastic"; easing.amplitude: 2.0; easing.period: 1.5 } \endqml Available types are: |