diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-17 13:22:03 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-17 13:22:03 (GMT) |
commit | faf6d0de6e3b8168fbd6f04c5380f47d350e2a22 (patch) | |
tree | d3c35778ad9c7abe68b681b39dd004027fd50880 /src/corelib/animation/qabstractanimation.cpp | |
parent | 3a92f40e1faf4d81f5071a66558b051a9fda727e (diff) | |
parent | 499a9aaabad0756cbca7b39751684308a6ba88ea (diff) | |
download | Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.zip Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.tar.gz Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.tar.bz2 |
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'src/corelib/animation/qabstractanimation.cpp')
-rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index be99b3b..ef4989b 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -665,7 +665,7 @@ int QAbstractAnimation::currentLoopTime() const The animation's current time starts at 0, and ends at totalDuration(). - \sa loopCount, currentLoopTime + \sa loopCount, currentLoopTime() */ int QAbstractAnimation::currentTime() const { |