diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-01 18:05:16 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-13 16:34:49 +0100 |
commit | c291efff26c13963cf98c127bfa759f89f103e48 (patch) | |
tree | 1ff72838794983592258f9718718db283834f42c /src/quick/items/qquickitem.cpp | |
parent | ada9dd41c83aad3890b8f01a98fdbeae04528eba (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: I62d203f21df63a95ee236e578b10418fd9680707
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r-- | src/quick/items/qquickitem.cpp | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 8f9a060329..e605f2ea7e 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -116,9 +116,9 @@ void QQuickItemPrivate::registerAccessorProperties() The following concrete Transform types are available: \list - \o \l Rotation - \o \l Scale - \o \l Translate + \li \l Rotation + \li \l Scale + \li \l Translate \endlist The Transform elements let you create and control advanced transformations that can be configured @@ -696,10 +696,10 @@ void QQuickKeyNavigationAttached::setBacktab(QQuickItem *i) or after the attached item's own key handling. \list - \o KeyNavigation.BeforeItem - process the key events before normal + \li KeyNavigation.BeforeItem - process the key events before normal item key processing. If the event is used for key navigation, it will be accepted and will not be passed on to the item. - \o KeyNavigation.AfterItem (default) - process the key events after normal item key + \li KeyNavigation.AfterItem (default) - process the key events after normal item key handling. If the item accepts the key event it will not be handled by the KeyNavigation attached property handler. \endlist @@ -933,21 +933,21 @@ bool QQuickKeysAttachedPrivate::isConnected(const char *signalName) If \l priority is Keys.BeforeItem (default) the order of key event processing is: \list 1 - \o Items specified in \c forwardTo - \o specific key handlers, e.g. onReturnPressed - \o onKeyPress, onKeyRelease handlers - \o Item specific key handling, e.g. TextInput key handling - \o parent item + \li Items specified in \c forwardTo + \li specific key handlers, e.g. onReturnPressed + \li onKeyPress, onKeyRelease handlers + \li Item specific key handling, e.g. TextInput key handling + \li parent item \endlist If priority is Keys.AfterItem the order of key event processing is: \list 1 - \o Item specific key handling, e.g. TextInput key handling - \o Items specified in \c forwardTo - \o specific key handlers, e.g. onReturnPressed - \o onKeyPress, onKeyRelease handlers - \o parent item + \li Item specific key handling, e.g. TextInput key handling + \li Items specified in \c forwardTo + \li specific key handlers, e.g. onReturnPressed + \li onKeyPress, onKeyRelease handlers + \li parent item \endlist If the event is accepted during any of the above steps, key @@ -970,10 +970,10 @@ bool QQuickKeysAttachedPrivate::isConnected(const char *signalName) or after the attached item's own key handling. \list - \o Keys.BeforeItem (default) - process the key events before normal + \li Keys.BeforeItem (default) - process the key events before normal item key processing. If the event is accepted it will not be passed on to the item. - \o Keys.AfterItem - process the key events after normal item key + \li Keys.AfterItem - process the key events after normal item key handling. If the item accepts the key event it will not be handled by the Keys attached property handler. \endlist @@ -2644,8 +2644,8 @@ void QQuickItemPrivate::transform_clear(QQmlListProperty<QQuickTransform> *prop) \table \row - \o \image declarative-item_stacking1.png - \o Same \c z - later children above earlier children: + \li \image declarative-item_stacking1.png + \li Same \c z - later children above earlier children: \qml Item { Rectangle { @@ -2659,8 +2659,8 @@ void QQuickItemPrivate::transform_clear(QQmlListProperty<QQuickTransform> *prop) } \endqml \row - \o \image declarative-item_stacking2.png - \o Higher \c z on top: + \li \image declarative-item_stacking2.png + \li Higher \c z on top: \qml Item { Rectangle { @@ -2675,8 +2675,8 @@ void QQuickItemPrivate::transform_clear(QQmlListProperty<QQuickTransform> *prop) } \endqml \row - \o \image declarative-item_stacking3.png - \o Same \c z - children above parents: + \li \image declarative-item_stacking3.png + \li Same \c z - children above parents: \qml Item { Rectangle { @@ -2690,8 +2690,8 @@ void QQuickItemPrivate::transform_clear(QQmlListProperty<QQuickTransform> *prop) } \endqml \row - \o \image declarative-item_stacking4.png - \o Lower \c z below: + \li \image declarative-item_stacking4.png + \li Lower \c z below: \qml Item { Rectangle { @@ -2769,8 +2769,8 @@ void QQuickItemPrivate::transform_clear(QQmlListProperty<QQuickTransform> *prop) \table \row - \o \image declarative-anchors_example.png - \o Text anchored to Image, horizontally centered and vertically below, with a margin. + \li \image declarative-anchors_example.png + \li Text anchored to Image, horizontally centered and vertically below, with a margin. \qml Item { Image { @@ -2787,8 +2787,8 @@ void QQuickItemPrivate::transform_clear(QQmlListProperty<QQuickTransform> *prop) } \endqml \row - \o \image declarative-anchors_example2.png - \o + \li \image declarative-anchors_example2.png + \li Left of Text anchored to right of Image, with a margin. The y property of both defaults to 0. @@ -3727,8 +3727,8 @@ void QQuickItem::setZ(qreal v) \table \row - \o \image declarative-rotation.png - \o + \li \image declarative-rotation.png + \li \qml Rectangle { color: "blue" @@ -3761,8 +3761,8 @@ void QQuickItem::setZ(qreal v) \table \row - \o \image declarative-scale.png - \o + \li \image declarative-scale.png + \li \qml Rectangle { color: "blue" @@ -3798,8 +3798,8 @@ void QQuickItem::setZ(qreal v) \table \row - \o \image declarative-item_opacity1.png - \o + \li \image declarative-item_opacity1.png + \li \qml Item { Rectangle { @@ -3813,8 +3813,8 @@ void QQuickItem::setZ(qreal v) } \endqml \row - \o \image declarative-item_opacity2.png - \o + \li \image declarative-item_opacity2.png + \li \qml Item { Rectangle { @@ -4438,7 +4438,7 @@ qreal QQuickItem::implicitWidth() const } \endqml - \bold Note: using implicitWidth of Text or TextEdit and setting the width explicitly + \b Note: using implicitWidth of Text or TextEdit and setting the width explicitly incurs a performance penalty as the text must be laid out twice. */ @@ -5631,9 +5631,9 @@ void QQuickItemLayer::setMipmap(bool mipmap) allow you to save some texture memory. \list - \o ShaderEffectSource.Alpha - GL_ALPHA - \o ShaderEffectSource.RGB - GL_RGB - \o ShaderEffectSource.RGBA - GL_RGBA + \li ShaderEffectSource.Alpha - GL_ALPHA + \li ShaderEffectSource.RGB - GL_RGB + \li ShaderEffectSource.RGBA - GL_RGBA \endlist \note Some OpenGL implementations do not support the GL_ALPHA format. @@ -5728,10 +5728,10 @@ void QQuickItemLayer::setSize(const QSize &size) specified. \list - \o ShaderEffectSource.ClampToEdge - GL_CLAMP_TO_EDGE both horizontally and vertically - \o ShaderEffectSource.RepeatHorizontally - GL_REPEAT horizontally, GL_CLAMP_TO_EDGE vertically - \o ShaderEffectSource.RepeatVertically - GL_CLAMP_TO_EDGE horizontally, GL_REPEAT vertically - \o ShaderEffectSource.Repeat - GL_REPEAT both horizontally and vertically + \li ShaderEffectSource.ClampToEdge - GL_CLAMP_TO_EDGE both horizontally and vertically + \li ShaderEffectSource.RepeatHorizontally - GL_REPEAT horizontally, GL_CLAMP_TO_EDGE vertically + \li ShaderEffectSource.RepeatVertically - GL_CLAMP_TO_EDGE horizontally, GL_REPEAT vertically + \li ShaderEffectSource.Repeat - GL_REPEAT both horizontally and vertically \endlist \note Some OpenGL ES 2 implementations do not support the GL_REPEAT |