summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-06-17 08:06:17 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-06-18 01:27:24 (GMT)
commit335616740f946db08ecd6806067daaeff1bee840 (patch)
treee746e9b247c702009e31da16cf05716976f894f9
parent25917c68a06432cccb1d40d2fb4207ce2d1407f6 (diff)
downloadQt-335616740f946db08ecd6806067daaeff1bee840.zip
Qt-335616740f946db08ecd6806067daaeff1bee840.tar.gz
Qt-335616740f946db08ecd6806067daaeff1bee840.tar.bz2
Doc fixes
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea.cpp12
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp24
2 files changed, 13 insertions, 23 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index c4956df..0bed41b 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -294,12 +294,12 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
/*!
\qmlsignal MouseArea::onCanceled()
- This handler is called when the mouse events are canceled, either because the event was not accepted or
- another element stole the mouse event handling. This signal is for advanced users, it's useful in case there
- is more than one mouse areas handling input, or when there is a mouse area inside a flickable. In the latter
- case, if you do some logic on pressed and then start dragging, the flickable will steal the mouse handling
- from the mouse area. In these cases, to reset the logic when there is no mouse handling anymore, you should
- use onCanceled, in addition to onReleased.
+ This handler is called when mouse events have been canceled, either because an event was not accepted, or
+ because another element stole the mouse event handling. This signal is for advanced use: it is useful when
+ there is more than one MouseArea that is handling input, or when there is a MouseArea inside a \l Flickable. In the latter
+ case, if you execute some logic on the pressed signal and then start dragging, the \l Flickable will steal the mouse handling
+ from the MouseArea. In these cases, to reset the logic when the MouseArea has lost the mouse handling to the
+ \l Flickable, \c onCanceled should be used in addition to onReleased.
*/
/*!
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 25cf133..f807866 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1344,24 +1344,14 @@ void QDeclarativeRotationAnimation::setTo(qreal t)
Possible values are:
- \table
- \row
- \o RotationAnimation.Numerical
- \o Rotate by linearly interpolating between the two numbers.
+ \list
+ \o RotationAnimation.Numerical (default) - Rotate by linearly interpolating between the two numbers.
A rotation from 10 to 350 will rotate 340 degrees clockwise.
- \row
- \o RotationAnimation.Clockwise
- \o Rotate clockwise between the two values
- \row
- \o RotationAnimation.Counterclockwise
- \o Rotate counterclockwise between the two values
- \row
- \o RotationAnimation.Shortest
- \o Rotate in the direction that produces the shortest animation path.
+ \o RotationAnimation.Clockwise - Rotate clockwise between the two values
+ \o RotationAnimation.Counterclockwise - Rotate counterclockwise between the two values
+ \o RotationAnimation.Shortest - Rotate in the direction that produces the shortest animation path.
A rotation from 10 to 350 will rotate 20 degrees counterclockwise.
- \endtable
-
- The default direction is RotationAnimation.Numerical.
+ \endlist
*/
QDeclarativeRotationAnimation::RotationDirection QDeclarativeRotationAnimation::direction() const
{
@@ -1747,7 +1737,7 @@ void QDeclarativePropertyAnimation::setFrom(const QVariant &f)
/*!
\qmlproperty real PropertyAnimation::to
This property holds the ending value.
- If not set, then the value defined in the end state of the transition or Behavior.
+ If not set, then the value defined in the end state of the transition or \l Behavior.
*/
QVariant QDeclarativePropertyAnimation::to() const
{