diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-14 22:02:58 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-14 22:02:58 (GMT) |
| commit | e3fcf351dee44b4f9457a6abbed76d37fc0fbe67 (patch) | |
| tree | 2c5e0a4eaedbfa1aa8145b6aef6bdd93a38f92fb /src/corelib/tools | |
| parent | f36d2e5cd0655cee2a1bfb84a66400a4b7a4c454 (diff) | |
| parent | ae3f20e9ce7f592c22c23e8dea6bb9feb52c8b90 (diff) | |
| download | Qt-e3fcf351dee44b4f9457a6abbed76d37fc0fbe67.zip Qt-e3fcf351dee44b4f9457a6abbed76d37fc0fbe67.tar.gz Qt-e3fcf351dee44b4f9457a6abbed76d37fc0fbe67.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tools/macdeployqt/shared/shared.cpp
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qtimeline.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/tools/qtimeline.cpp b/src/corelib/tools/qtimeline.cpp index 2979a09..3a03558 100644 --- a/src/corelib/tools/qtimeline.cpp +++ b/src/corelib/tools/qtimeline.cpp @@ -225,7 +225,9 @@ void QTimeLinePrivate::setCurrentTime(int msecs) valueForTime() and emitting valueChanged(). By default, valueForTime() applies an interpolation algorithm to generate these value. You can choose from a set of predefined timeline algorithms by calling - setCurveShape(). By default, QTimeLine uses the EaseInOut curve shape, + setCurveShape(). + + Note that by default, QTimeLine uses the EaseInOut curve shape, which provides a value that grows slowly, then grows steadily, and finally grows slowly. For a custom timeline, you can reimplement valueForTime(), in which case QTimeLine's curveShape property is ignored. |