diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-10 08:33:34 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-10 08:33:34 (GMT) |
| commit | e5913012f44843bd8f7a6cc28de5de87f134aa65 (patch) | |
| tree | 9acb7897440aec8eec7e926cb160c59a8fed78d2 /src/corelib/tools | |
| parent | 761b2fec23a17ea523cbd78beb2731526ea19891 (diff) | |
| parent | 7aa2d76dfc4a107f38c5cb0aac00a0b31d0fbbb6 (diff) | |
| download | Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.zip Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.tar.gz Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/script/api/qscriptable.cpp
src/script/api/qscriptable_p.h
src/script/qscriptclassdata.cpp
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qtimeline.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/tools/qtimeline.cpp b/src/corelib/tools/qtimeline.cpp index e32fc03..7402ba6 100644 --- a/src/corelib/tools/qtimeline.cpp +++ b/src/corelib/tools/qtimeline.cpp @@ -663,6 +663,7 @@ qreal QTimeLine::valueForTime(int msec) const second). You can change the update interval by calling setUpdateInterval(). + The timeline will start from position 0, or the end if going backward. If you want to resume a stopped timeline without restarting, you can call resume() instead. @@ -675,10 +676,8 @@ void QTimeLine::start() qWarning("QTimeLine::start: already running"); return; } - int curTime = d->currentTime; - if (curTime == d->duration && d->direction == Forward) - curTime = 0; - else if (curTime == 0 && d->direction == Backward) + int curTime = 0; + if (d->direction == Backward) curTime = d->duration; d->timerId = startTimer(d->updateInterval); d->startTime = curTime; @@ -694,7 +693,7 @@ void QTimeLine::start() frame and value at regular intervals. In contrast to start(), this function does not restart the timeline before - is resumes. + it resumes. \sa start(), updateInterval(), frameChanged(), valueChanged() */ |