diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-09-17 06:37:15 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-09-17 06:37:15 (GMT) |
commit | 2f9017c7736b3f8db721f6605e6131ab376cb864 (patch) | |
tree | e2a5c7fdacdc19e2ebddcb6dcf628255d81d78f2 /src/declarative/util | |
parent | 0c2e40683007c9405b8fc9f7efbd728ef519d78f (diff) | |
parent | 8caff8b4be02a2f28c9a2a50d3b5ef274138021e (diff) | |
download | Qt-2f9017c7736b3f8db721f6605e6131ab376cb864.zip Qt-2f9017c7736b3f8db721f6605e6131ab376cb864.tar.gz Qt-2f9017c7736b3f8db721f6605e6131ab376cb864.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util')
-rw-r--r-- | src/declarative/util/qmleasefollow.cpp | 2 | ||||
-rw-r--r-- | src/declarative/util/qmlspringfollow.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp index b58ad14..860c63a 100644 --- a/src/declarative/util/qmleasefollow.cpp +++ b/src/declarative/util/qmleasefollow.cpp @@ -242,6 +242,8 @@ Rectangle { Keys.onDownPressed: Rect1.y = Rect1.y + 100 } \endcode + + \sa SpringFollow */ QmlEaseFollow::QmlEaseFollow(QObject *parent) diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp index 8c902aa..2dae448 100644 --- a/src/declarative/util/qmlspringfollow.cpp +++ b/src/declarative/util/qmlspringfollow.cpp @@ -236,6 +236,8 @@ void QmlSpringFollowPrivate::stop() y: SpringFollow { source: Rect1.y; velocity: 200 } } \endcode + + \sa EaseFollow */ QmlSpringFollow::QmlSpringFollow(QObject *parent) |