summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2012-03-01 19:02:20 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-13 15:27:31 +0100
commitc051ea15c75851132d08f22825d84d4ea3f49241 (patch)
treeea3aa28296355f313d204f6e190f74cfd87dee0a /src/declarative/util
parentdc5c8d1099ac851b51accf5f87c5be4fc1610c1a (diff)
Remove the usage of deprecated qdoc macros.
QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: Iae34eb8f2233dd9dbec79e7ab3c324f3f505b4cc Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp276
-rw-r--r--src/declarative/util/qdeclarativeconnections.cpp6
-rw-r--r--src/declarative/util/qdeclarativefontloader.cpp14
-rw-r--r--src/declarative/util/qdeclarativepropertymap.cpp4
-rw-r--r--src/declarative/util/qdeclarativesmoothedanimation.cpp6
-rw-r--r--src/declarative/util/qdeclarativesystempalette.cpp6
-rw-r--r--src/declarative/util/qdeclarativetimeline.cpp14
-rw-r--r--src/declarative/util/qdeclarativeview.cpp18
-rw-r--r--src/declarative/util/qdeclarativexmllistmodel.cpp8
9 files changed, 176 insertions, 176 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index f864757e..f697a49d 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -1466,11 +1466,11 @@ void QDeclarativeRotationAnimation::setTo(qreal t)
Possible values are:
\list
- \o RotationAnimation.Numerical (default) - Rotate by linearly interpolating between the two numbers.
+ \li RotationAnimation.Numerical (default) - Rotate by linearly interpolating between the two numbers.
A rotation from 10 to 350 will rotate 340 degrees clockwise.
- \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.
+ \li RotationAnimation.Clockwise - Rotate clockwise between the two values
+ \li RotationAnimation.Counterclockwise - Rotate counterclockwise between the two values
+ \li RotationAnimation.Shortest - Rotate in the direction that produces the shortest animation path.
A rotation from 10 to 350 will rotate 20 degrees counterclockwise.
\endlist
*/
@@ -1754,7 +1754,7 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
It can be used to define animations in a number of ways:
\list
- \o In a \l Transition
+ \li In a \l Transition
For example, to animate any objects that have changed their \c x or \c y properties
as a result of a state change, using an \c InOutQuad easing curve:
@@ -1762,21 +1762,21 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
\snippet doc/src/snippets/declarative/propertyanimation.qml transition
- \o In a \l Behavior
+ \li In a \l Behavior
For example, to animate all changes to a rectangle's \c x property:
\snippet doc/src/snippets/declarative/propertyanimation.qml behavior
- \o As a property value source
+ \li As a property value source
For example, to repeatedly animate the rectangle's \c x property:
\snippet doc/src/snippets/declarative/propertyanimation.qml propertyvaluesource
- \o In a signal handler
+ \li In a signal handler
For example, to fade out \c theObject when clicked:
\qml
@@ -1786,7 +1786,7 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
}
\endqml
- \o Standalone
+ \li Standalone
For example, to animate \c rect's \c width property over 500ms, from its current width to 30:
@@ -1928,171 +1928,171 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t)
\table
\row
- \o \c Easing.Linear
- \o Easing curve for a linear (t) function: velocity is constant.
- \o \inlineimage qeasingcurve-linear.png
+ \li \c Easing.Linear
+ \li Easing curve for a linear (t) function: velocity is constant.
+ \li \inlineimage qeasingcurve-linear.png
\row
- \o \c Easing.InQuad
- \o Easing curve for a quadratic (t^2) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inquad.png
+ \li \c Easing.InQuad
+ \li Easing curve for a quadratic (t^2) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inquad.png
\row
- \o \c Easing.OutQuad
- \o Easing curve for a quadratic (t^2) function: decelerating to zero velocity.
- \o \inlineimage qeasingcurve-outquad.png
+ \li \c Easing.OutQuad
+ \li Easing curve for a quadratic (t^2) function: decelerating to zero velocity.
+ \li \inlineimage qeasingcurve-outquad.png
\row
- \o \c Easing.InOutQuad
- \o Easing curve for a quadratic (t^2) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutquad.png
+ \li \c Easing.InOutQuad
+ \li Easing curve for a quadratic (t^2) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutquad.png
\row
- \o \c Easing.OutInQuad
- \o Easing curve for a quadratic (t^2) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinquad.png
+ \li \c Easing.OutInQuad
+ \li Easing curve for a quadratic (t^2) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinquad.png
\row
- \o \c Easing.InCubic
- \o Easing curve for a cubic (t^3) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-incubic.png
+ \li \c Easing.InCubic
+ \li Easing curve for a cubic (t^3) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-incubic.png
\row
- \o \c Easing.OutCubic
- \o Easing curve for a cubic (t^3) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outcubic.png
+ \li \c Easing.OutCubic
+ \li Easing curve for a cubic (t^3) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outcubic.png
\row
- \o \c Easing.InOutCubic
- \o Easing curve for a cubic (t^3) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutcubic.png
+ \li \c Easing.InOutCubic
+ \li Easing curve for a cubic (t^3) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutcubic.png
\row
- \o \c Easing.OutInCubic
- \o Easing curve for a cubic (t^3) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outincubic.png
+ \li \c Easing.OutInCubic
+ \li Easing curve for a cubic (t^3) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outincubic.png
\row
- \o \c Easing.InQuart
- \o Easing curve for a quartic (t^4) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inquart.png
+ \li \c Easing.InQuart
+ \li Easing curve for a quartic (t^4) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inquart.png
\row
- \o \c Easing.OutQuart
- \o Easing curve for a quartic (t^4) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outquart.png
+ \li \c Easing.OutQuart
+ \li Easing curve for a quartic (t^4) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outquart.png
\row
- \o \c Easing.InOutQuart
- \o Easing curve for a quartic (t^4) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutquart.png
+ \li \c Easing.InOutQuart
+ \li Easing curve for a quartic (t^4) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutquart.png
\row
- \o \c Easing.OutInQuart
- \o Easing curve for a quartic (t^4) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinquart.png
+ \li \c Easing.OutInQuart
+ \li Easing curve for a quartic (t^4) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinquart.png
\row
- \o \c Easing.InQuint
- \o Easing curve for a quintic (t^5) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inquint.png
+ \li \c Easing.InQuint
+ \li Easing curve for a quintic (t^5) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inquint.png
\row
- \o \c Easing.OutQuint
- \o Easing curve for a quintic (t^5) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outquint.png
+ \li \c Easing.OutQuint
+ \li Easing curve for a quintic (t^5) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outquint.png
\row
- \o \c Easing.InOutQuint
- \o Easing curve for a quintic (t^5) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutquint.png
+ \li \c Easing.InOutQuint
+ \li Easing curve for a quintic (t^5) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutquint.png
\row
- \o \c Easing.OutInQuint
- \o Easing curve for a quintic (t^5) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinquint.png
+ \li \c Easing.OutInQuint
+ \li Easing curve for a quintic (t^5) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinquint.png
\row
- \o \c Easing.InSine
- \o Easing curve for a sinusoidal (sin(t)) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-insine.png
+ \li \c Easing.InSine
+ \li Easing curve for a sinusoidal (sin(t)) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-insine.png
\row
- \o \c Easing.OutSine
- \o Easing curve for a sinusoidal (sin(t)) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outsine.png
+ \li \c Easing.OutSine
+ \li Easing curve for a sinusoidal (sin(t)) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outsine.png
\row
- \o \c Easing.InOutSine
- \o Easing curve for a sinusoidal (sin(t)) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutsine.png
+ \li \c Easing.InOutSine
+ \li Easing curve for a sinusoidal (sin(t)) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutsine.png
\row
- \o \c Easing.OutInSine
- \o Easing curve for a sinusoidal (sin(t)) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinsine.png
+ \li \c Easing.OutInSine
+ \li Easing curve for a sinusoidal (sin(t)) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinsine.png
\row
- \o \c Easing.InExpo
- \o Easing curve for an exponential (2^t) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inexpo.png
+ \li \c Easing.InExpo
+ \li Easing curve for an exponential (2^t) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inexpo.png
\row
- \o \c Easing.OutExpo
- \o Easing curve for an exponential (2^t) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outexpo.png
+ \li \c Easing.OutExpo
+ \li Easing curve for an exponential (2^t) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outexpo.png
\row
- \o \c Easing.InOutExpo
- \o Easing curve for an exponential (2^t) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutexpo.png
+ \li \c Easing.InOutExpo
+ \li Easing curve for an exponential (2^t) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutexpo.png
\row
- \o \c Easing.OutInExpo
- \o Easing curve for an exponential (2^t) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinexpo.png
+ \li \c Easing.OutInExpo
+ \li Easing curve for an exponential (2^t) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinexpo.png
\row
- \o \c Easing.InCirc
- \o Easing curve for a circular (sqrt(1-t^2)) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-incirc.png
+ \li \c Easing.InCirc
+ \li Easing curve for a circular (sqrt(1-t^2)) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-incirc.png
\row
- \o \c Easing.OutCirc
- \o Easing curve for a circular (sqrt(1-t^2)) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outcirc.png
+ \li \c Easing.OutCirc
+ \li Easing curve for a circular (sqrt(1-t^2)) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outcirc.png
\row
- \o \c Easing.InOutCirc
- \o Easing curve for a circular (sqrt(1-t^2)) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutcirc.png
+ \li \c Easing.InOutCirc
+ \li Easing curve for a circular (sqrt(1-t^2)) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutcirc.png
\row
- \o \c Easing.OutInCirc
- \o Easing curve for a circular (sqrt(1-t^2)) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outincirc.png
+ \li \c Easing.OutInCirc
+ \li Easing curve for a circular (sqrt(1-t^2)) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outincirc.png
\row
- \o \c Easing.InElastic
- \o Easing curve for an elastic (exponentially decaying sine wave) function: accelerating from zero velocity.
+ \li \c Easing.InElastic
+ \li Easing curve for an elastic (exponentially decaying sine wave) function: accelerating from zero velocity.
\br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
- \o \inlineimage qeasingcurve-inelastic.png
+ \li \inlineimage qeasingcurve-inelastic.png
\row
- \o \c Easing.OutElastic
- \o Easing curve for an elastic (exponentially decaying sine wave) function: decelerating from zero velocity.
+ \li \c Easing.OutElastic
+ \li Easing curve for an elastic (exponentially decaying sine wave) function: decelerating from zero velocity.
\br The peak amplitude can be set with the \e amplitude parameter, and the period of decay by the \e period parameter.
- \o \inlineimage qeasingcurve-outelastic.png
+ \li \inlineimage qeasingcurve-outelastic.png
\row
- \o \c Easing.InOutElastic
- \o Easing curve for an elastic (exponentially decaying sine wave) function: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutelastic.png
+ \li \c Easing.InOutElastic
+ \li Easing curve for an elastic (exponentially decaying sine wave) function: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutelastic.png
\row
- \o \c Easing.OutInElastic
- \o Easing curve for an elastic (exponentially decaying sine wave) function: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinelastic.png
+ \li \c Easing.OutInElastic
+ \li Easing curve for an elastic (exponentially decaying sine wave) function: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinelastic.png
\row
- \o \c Easing.InBack
- \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inback.png
+ \li \c Easing.InBack
+ \li Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inback.png
\row
- \o \c Easing.OutBack
- \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing out: decelerating to zero velocity.
- \o \inlineimage qeasingcurve-outback.png
+ \li \c Easing.OutBack
+ \li Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing out: decelerating to zero velocity.
+ \li \inlineimage qeasingcurve-outback.png
\row
- \o \c Easing.InOutBack
- \o Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutback.png
+ \li \c Easing.InOutBack
+ \li Easing curve for a back (overshooting cubic function: (s+1)*t^3 - s*t^2) easing in/out: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutback.png
\row
- \o \c Easing.OutInBack
- \o Easing curve for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinback.png
+ \li \c Easing.OutInBack
+ \li Easing curve for a back (overshooting cubic easing: (s+1)*t^3 - s*t^2) easing out/in: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinback.png
\row
- \o \c Easing.InBounce
- \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: accelerating from zero velocity.
- \o \inlineimage qeasingcurve-inbounce.png
+ \li \c Easing.InBounce
+ \li Easing curve for a bounce (exponentially decaying parabolic bounce) function: accelerating from zero velocity.
+ \li \inlineimage qeasingcurve-inbounce.png
\row
- \o \c Easing.OutBounce
- \o Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating from zero velocity.
- \o \inlineimage qeasingcurve-outbounce.png
+ \li \c Easing.OutBounce
+ \li Easing curve for a bounce (exponentially decaying parabolic bounce) function: decelerating from zero velocity.
+ \li \inlineimage qeasingcurve-outbounce.png
\row
- \o \c Easing.InOutBounce
- \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing in/out: acceleration until halfway, then deceleration.
- \o \inlineimage qeasingcurve-inoutbounce.png
+ \li \c Easing.InOutBounce
+ \li Easing curve for a bounce (exponentially decaying parabolic bounce) function easing in/out: acceleration until halfway, then deceleration.
+ \li \inlineimage qeasingcurve-inoutbounce.png
\row
- \o \c Easing.OutInBounce
- \o Easing curve for a bounce (exponentially decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration.
- \o \inlineimage qeasingcurve-outinbounce.png
+ \li \c Easing.OutInBounce
+ \li Easing curve for a bounce (exponentially decaying parabolic bounce) function easing out/in: deceleration until halfway, then acceleration.
+ \li \inlineimage qeasingcurve-outinbounce.png
\endtable
\c easing.amplitude is only applicable for bounce and elastic curves (curves of type
@@ -2200,8 +2200,8 @@ void QDeclarativePropertyAnimation::setProperties(const QString &prop)
\table 80%
\row
- \o Value Source / Behavior
- \o When an animation is used as a value source or in a Behavior, the default target and property
+ \li Value Source / Behavior
+ \li When an animation is used as a value source or in a Behavior, the default target and property
name to be animated can both be inferred.
\qml
Rectangle {
@@ -2213,8 +2213,8 @@ void QDeclarativePropertyAnimation::setProperties(const QString &prop)
}
\endqml
\row
- \o Transition
- \o When used in a transition, a property animation is assumed to match \e all targets
+ \li Transition
+ \li When used in a transition, a property animation is assumed to match \e all targets
but \e no properties. In practice, that means you need to specify at least the properties
in order for the animation to do anything.
\qml
@@ -2238,8 +2238,8 @@ void QDeclarativePropertyAnimation::setProperties(const QString &prop)
}
\endqml
\row
- \o Standalone
- \o When an animation is used standalone, both the target and property need to be
+ \li Standalone
+ \li When an animation is used standalone, both the target and property need to be
explicitly specified.
\qml
Rectangle {
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index 4197adf9..866fa042 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -91,9 +91,9 @@ public:
cases, such as when:
\list
- \i Multiple connections to the same signal are required
- \i Creating connections outside the scope of the signal sender
- \i Connecting to targets not defined in QML
+ \li Multiple connections to the same signal are required
+ \li Creating connections outside the scope of the signal sender
+ \li Connecting to targets not defined in QML
\endlist
When any of these are needed, the Connections element can be used instead.
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index 13b3f02e..b1baea58 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -298,22 +298,22 @@ void QDeclarativeFontLoader::setName(const QString &name)
This property holds the status of font loading. It can be one of:
\list
- \o FontLoader.Null - no font has been set
- \o FontLoader.Ready - the font has been loaded
- \o FontLoader.Loading - the font is currently being loaded
- \o FontLoader.Error - an error occurred while loading the font
+ \li FontLoader.Null - no font has been set
+ \li FontLoader.Ready - the font has been loaded
+ \li FontLoader.Loading - the font is currently being loaded
+ \li FontLoader.Error - an error occurred while loading the font
\endlist
Use this status to provide an update or respond to the status change in some way.
For example, you could:
\list
- \o Trigger a state change:
+ \li Trigger a state change:
\qml
State { name: 'loaded'; when: loader.status == FontLoader.Ready }
\endqml
- \o Implement an \c onStatusChanged signal handler:
+ \li Implement an \c onStatusChanged signal handler:
\qml
FontLoader {
id: loader
@@ -321,7 +321,7 @@ void QDeclarativeFontLoader::setName(const QString &name)
}
\endqml
- \o Bind to the status value:
+ \li Bind to the status value:
\qml
Text { text: loader.status == FontLoader.Ready ? 'Loaded' : 'Not loaded' }
\endqml
diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp
index 40601b78..29b38631 100644
--- a/src/declarative/util/qdeclarativepropertymap.cpp
+++ b/src/declarative/util/qdeclarativepropertymap.cpp
@@ -129,7 +129,7 @@ void QDeclarativePropertyMapMetaObject::propertyCreated(int, QMetaPropertyBuilde
key will be updated as well.
To detect value changes made in the UI layer you can connect to the valueChanged() signal.
- However, note that valueChanged() is \bold NOT emitted when changes are made by calling insert()
+ However, note that valueChanged() is \b NOT emitted when changes are made by calling insert()
or clear() - it is only emitted when a value is updated from QML.
\note It is not possible to remove keys from the map; once a key has been added, you can only
@@ -289,7 +289,7 @@ QVariant QDeclarativePropertyMap::operator[](const QString &key) const
This signal is emitted whenever one of the values in the map is changed. \a key
is the key corresponding to the \a value that was changed.
- \note valueChanged() is \bold NOT emitted when changes are made by calling insert()
+ \note valueChanged() is \b NOT emitted when changes are made by calling insert()
or clear() - it is only emitted when a value is updated from QML.
*/
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index db2e9be1..36402fb1 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -386,9 +386,9 @@ void QDeclarativeSmoothedAnimation::transition(QDeclarativeStateActions &actions
Possible values are:
\list
- \o SmoothedAnimation.Eased (default) - the animation will smoothly decelerate, and then reverse direction
- \o SmoothedAnimation.Immediate - the animation will immediately begin accelerating in the reverse direction, beginning with a velocity of 0
- \o SmoothedAnimation.Sync - the property is immediately set to the target value
+ \li SmoothedAnimation.Eased (default) - the animation will smoothly decelerate, and then reverse direction
+ \li SmoothedAnimation.Immediate - the animation will immediately begin accelerating in the reverse direction, beginning with a velocity of 0
+ \li SmoothedAnimation.Sync - the property is immediately set to the target value
\endlist
*/
QDeclarativeSmoothedAnimation::ReversingMode QDeclarativeSmoothedAnimation::reversingMode() const
diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp
index f78b69a8..134137f2 100644
--- a/src/declarative/util/qdeclarativesystempalette.cpp
+++ b/src/declarative/util/qdeclarativesystempalette.cpp
@@ -267,9 +267,9 @@ QColor QDeclarativeSystemPalette::highlightedText() const
The color group of the palette. This can be one of:
\list
- \o SystemPalette.Active (default)
- \o SystemPalette.Inactive
- \o SystemPalette.Disabled
+ \li SystemPalette.Active (default)
+ \li SystemPalette.Inactive
+ \li SystemPalette.Disabled
\endlist
\sa QPalette::ColorGroup
diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp
index 884953d1..8eb3a960 100644
--- a/src/declarative/util/qdeclarativetimeline.cpp
+++ b/src/declarative/util/qdeclarativetimeline.cpp
@@ -259,7 +259,7 @@ qreal QDeclarativeTimeLinePrivate::value(const Op &op, int time, qreal base, boo
QDeclarativeTimeLine is similar to QTimeLine except:
\list
- \i It updates QDeclarativeTimeLineValue instances directly, rather than maintaining a single
+ \li It updates QDeclarativeTimeLineValue instances directly, rather than maintaining a single
current value.
For example, the following animates a simple value over 200 milliseconds:
@@ -274,7 +274,7 @@ qreal QDeclarativeTimeLinePrivate::value(const Op &op, int time, qreal base, boo
connect to the QDeclarativeTimeLine's updated() signal, or inherit from QDeclarativeTimeLineValue
and reimplement the QDeclarativeTimeLineValue::setValue() method.
- \i Supports multiple QDeclarativeTimeLineValue, arbitrary start and end values and allows
+ \li Supports multiple QDeclarativeTimeLineValue, arbitrary start and end values and allows
animations to be strung together for more complex effects.
For example, the following animation moves the x and y coordinates of
@@ -294,7 +294,7 @@ qreal QDeclarativeTimeLinePrivate::value(const Op &op, int time, qreal base, boo
tl.move(y, 200., 50);
\endcode
- \i All QDeclarativeTimeLine instances share a single, synchronized clock.
+ \li All QDeclarativeTimeLine instances share a single, synchronized clock.
Actions scheduled within the same event loop tick are scheduled
synchronously against each other, regardless of the wall time between the
@@ -585,10 +585,10 @@ void QDeclarativeTimeLine::sync(QDeclarativeTimeLineValue &timeLineValue)
will result in:
\table
- \header \o \o 0ms \o 50ms \o 100ms \o 150ms \o 200ms \o 250ms \o 300ms
- \row \o value1 \o 0 \o 2.5 \o 5.0 \o 7.5 \o 10 \o 10 \o 10
- \row \o value2 \o 0 \o 5.0 \o 10.0 \o 10.0 \o 10.0 \o 15.0 \o 20.0
- \row \o value2 \o 0 \o 0 \o 0 \o 0 \o 0 \o 10.0 \o 20.0
+ \header \li \li 0ms \li 50ms \li 100ms \li 150ms \li 200ms \li 250ms \li 300ms
+ \row \li value1 \li 0 \li 2.5 \li 5.0 \li 7.5 \li 10 \li 10 \li 10
+ \row \li value2 \li 0 \li 5.0 \li 10.0 \li 10.0 \li 10.0 \li 15.0 \li 20.0
+ \row \li value2 \li 0 \li 0 \li 0 \li 0 \li 0 \li 10.0 \li 20.0
\endtable
*/
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 7bd6bd16..f81d9912 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -202,18 +202,18 @@ void QDeclarativeViewPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem,
QDeclarativeView provides:
\list
- \o Management of QDeclarativeComponent loading and object creation
- \o Initialization of QGraphicsView for optimal performance with QML using these settings:
+ \li Management of QDeclarativeComponent loading and object creation
+ \li Initialization of QGraphicsView for optimal performance with QML using these settings:
\list
- \o QGraphicsView::setOptimizationFlags(QGraphicsView::DontSavePainterState)
- \o QGraphicsView::setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate)
- \o QGraphicsScene::setItemIndexMethod(QGraphicsScene::NoIndex)
+ \li QGraphicsView::setOptimizationFlags(QGraphicsView::DontSavePainterState)
+ \li QGraphicsView::setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate)
+ \li QGraphicsScene::setItemIndexMethod(QGraphicsScene::NoIndex)
\endlist
- \o Initialization of QGraphicsView for QML key handling using these settings:
+ \li Initialization of QGraphicsView for QML key handling using these settings:
\list
- \o QGraphicsView::viewport()->setFocusPolicy(Qt::NoFocus)
- \o QGraphicsView::setFocusPolicy(Qt::StrongFocus)
- \o QGraphicsScene::setStickyFocus(true)
+ \li QGraphicsView::viewport()->setFocusPolicy(Qt::NoFocus)
+ \li QGraphicsView::setFocusPolicy(Qt::StrongFocus)
+ \li QGraphicsScene::setStickyFocus(true)
\endlist
\endlist
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index cb106892..35cc1a4c 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -909,10 +909,10 @@ QScriptValue QDeclarativeXmlListModel::get(int index) const
Specifies the model loading status, which can be one of the following:
\list
- \o XmlListModel.Null - No XML data has been set for this model.
- \o XmlListModel.Ready - The XML data has been loaded into the model.
- \o XmlListModel.Loading - The model is in the process of reading and loading XML data.
- \o XmlListModel.Error - An error occurred while the model was loading. See errorString() for details
+ \li XmlListModel.Null - No XML data has been set for this model.
+ \li XmlListModel.Ready - The XML data has been loaded into the model.
+ \li XmlListModel.Loading - The model is in the process of reading and loading XML data.
+ \li XmlListModel.Error - An error occurred while the model was loading. See errorString() for details
about the error.
\endlist