diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-01 19:02:20 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-13 15:27:31 +0100 |
| commit | c051ea15c75851132d08f22825d84d4ea3f49241 (patch) | |
| tree | ea3aa28296355f313d204f6e190f74cfd87dee0a /src | |
| parent | dc5c8d1099ac851b51accf5f87c5be4fc1610c1a (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')
40 files changed, 651 insertions, 651 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index 019ac089..490330c1 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -71,12 +71,12 @@ QT_BEGIN_NAMESPACE create the displayed border image in the following way: \list - \i The corners (regions 1, 3, 7, and 9) are not scaled at all. - \i Regions 2 and 8 are scaled according to + \li The corners (regions 1, 3, 7, and 9) are not scaled at all. + \li Regions 2 and 8 are scaled according to \l{BorderImage::horizontalTileMode}{horizontalTileMode}. - \i Regions 4 and 6 are scaled according to + \li Regions 4 and 6 are scaled according to \l{BorderImage::verticalTileMode}{verticalTileMode}. - \i The middle (region 5) is scaled according to both + \li The middle (region 5) is scaled according to both \l{BorderImage::horizontalTileMode}{horizontalTileMode} and \l{BorderImage::verticalTileMode}{verticalTileMode}. \endlist @@ -181,10 +181,10 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage() This property describes the status of image loading. It can be one of: \list - \o BorderImage.Null - no image has been set - \o BorderImage.Ready - the image has been loaded - \o BorderImage.Loading - the image is currently being loaded - \o BorderImage.Error - an error occurred while loading the image + \li BorderImage.Null - no image has been set + \li BorderImage.Ready - the image has been loaded + \li BorderImage.Loading - the image is currently being loaded + \li BorderImage.Error - an error occurred while loading the image \endlist \sa progress @@ -417,9 +417,9 @@ QDeclarativeScaleGrid *QDeclarativeBorderImage::border() This property describes how to repeat or stretch the middle parts of the border image. \list - \o BorderImage.Stretch - Scales the image to fit to the available area. - \o BorderImage.Repeat - Tile the image until there is no more space. May crop the last image. - \o BorderImage.Round - Like Repeat, but scales the images down to ensure that the last image is not cropped. + \li BorderImage.Stretch - Scales the image to fit to the available area. + \li BorderImage.Repeat - Tile the image until there is no more space. May crop the last image. + \li BorderImage.Round - Like Repeat, but scales the images down to ensure that the last image is not cropped. \endlist The default tile mode for each property is BorderImage.Stretch. diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp index 6edc3923..6ba97cb7 100644 --- a/src/declarative/graphicsitems/qdeclarativeevents.cpp +++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp @@ -116,12 +116,12 @@ Item { It contains a bitwise combination of: \list - \o Qt.NoModifier - No modifier key is pressed. - \o Qt.ShiftModifier - A Shift key on the keyboard is pressed. - \o Qt.ControlModifier - A Ctrl key on the keyboard is pressed. - \o Qt.AltModifier - An Alt key on the keyboard is pressed. - \o Qt.MetaModifier - A Meta key on the keyboard is pressed. - \o Qt.KeypadModifier - A keypad button is pressed. + \li Qt.NoModifier - No modifier key is pressed. + \li Qt.ShiftModifier - A Shift key on the keyboard is pressed. + \li Qt.ControlModifier - A Ctrl key on the keyboard is pressed. + \li Qt.AltModifier - An Alt key on the keyboard is pressed. + \li Qt.MetaModifier - A Meta key on the keyboard is pressed. + \li Qt.KeypadModifier - A keypad button is pressed. \endlist For example, to react to a Shift key + Enter key combination: @@ -178,9 +178,9 @@ Item { This property holds the button that caused the event. It can be one of: \list - \o Qt.LeftButton - \o Qt.RightButton - \o Qt.MiddleButton + \li Qt.LeftButton + \li Qt.RightButton + \li Qt.MiddleButton \endlist */ @@ -201,9 +201,9 @@ Item { It contains a bitwise combination of: \list - \o Qt.LeftButton - \o Qt.RightButton - \o Qt.MiddleButton + \li Qt.LeftButton + \li Qt.RightButton + \li Qt.MiddleButton \endlist */ @@ -215,12 +215,12 @@ Item { It contains a bitwise combination of: \list - \o Qt.NoModifier - No modifier key is pressed. - \o Qt.ShiftModifier - A Shift key on the keyboard is pressed. - \o Qt.ControlModifier - A Ctrl key on the keyboard is pressed. - \o Qt.AltModifier - An Alt key on the keyboard is pressed. - \o Qt.MetaModifier - A Meta key on the keyboard is pressed. - \o Qt.KeypadModifier - A keypad button is pressed. + \li Qt.NoModifier - No modifier key is pressed. + \li Qt.ShiftModifier - A Shift key on the keyboard is pressed. + \li Qt.ControlModifier - A Ctrl key on the keyboard is pressed. + \li Qt.AltModifier - An Alt key on the keyboard is pressed. + \li Qt.MetaModifier - A Meta key on the keyboard is pressed. + \li Qt.KeypadModifier - A keypad button is pressed. \endlist For example, to react to a Shift key + Left mouse button click: diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index d0016195..4dd295e2 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -722,13 +722,13 @@ QDeclarativeFlickableVisibleArea *QDeclarativeFlickable::visibleArea() This property determines which directions the view can be flicked. \list - \o Flickable.AutoFlickDirection (default) - allows flicking vertically if the + \li Flickable.AutoFlickDirection (default) - allows flicking vertically if the \e contentHeight is not equal to the \e height of the Flickable. Allows flicking horizontally if the \e contentWidth is not equal to the \e width of the Flickable. - \o Flickable.HorizontalFlick - allows flicking horizontally. - \o Flickable.VerticalFlick - allows flicking vertically. - \o Flickable.HorizontalAndVerticalFlick - allows flicking in both directions. + \li Flickable.HorizontalFlick - allows flicking horizontally. + \li Flickable.VerticalFlick - allows flicking vertically. + \li Flickable.HorizontalAndVerticalFlick - allows flicking in both directions. \endlist */ QDeclarativeFlickable::FlickableDirection QDeclarativeFlickable::flickableDirection() const @@ -1299,11 +1299,11 @@ QDeclarativeListProperty<QGraphicsObject> QDeclarativeFlickable::flickableChildr The \c boundsBehavior can be one of: \list - \o Flickable.StopAtBounds - the contents can not be dragged beyond the boundary + \li Flickable.StopAtBounds - the contents can not be dragged beyond the boundary of the flickable, and flicks will not overshoot. - \o Flickable.DragOverBounds - the contents can be dragged beyond the boundary + \li Flickable.DragOverBounds - the contents can be dragged beyond the boundary of the Flickable, but flicks will not overshoot. - \o Flickable.DragAndOvershootBounds (default) - the contents can be dragged + \li Flickable.DragAndOvershootBounds (default) - the contents can be dragged beyond the boundary of the Flickable, and can overshoot the boundary when flicked. \endlist diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index dc399e1c..37dc5d46 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -1746,13 +1746,13 @@ void QDeclarativeGridView::setHighlightMoveDuration(int duration) Valid values for \c highlightRangeMode are: \list - \o GridView.ApplyRange - the view attempts to maintain the highlight within the range. + \li GridView.ApplyRange - the view attempts to maintain the highlight within the range. However, the highlight can move outside of the range at the ends of the view or due to mouse interaction. - \o GridView.StrictlyEnforceRange - the highlight never moves outside of the range. + \li GridView.StrictlyEnforceRange - the highlight never moves outside of the range. The current item changes if a keyboard or mouse action would cause the highlight to move outside of the range. - \o GridView.NoHighlightRange - this is the default value. + \li GridView.NoHighlightRange - this is the default value. \endlist */ qreal QDeclarativeGridView::preferredHighlightBegin() const @@ -1832,9 +1832,9 @@ void QDeclarativeGridView::setHighlightRangeMode(HighlightRangeMode mode) Possible values: \list - \o Qt.LeftToRight (default) - Items will be laid out starting in the top, left corner. The flow is + \li Qt.LeftToRight (default) - Items will be laid out starting in the top, left corner. The flow is dependent on the \l GridView::flow property. - \o Qt.RightToLeft - Items will be laid out starting in the top, right corner. The flow is dependent + \li Qt.RightToLeft - Items will be laid out starting in the top, right corner. The flow is dependent on the \l GridView::flow property. \endlist @@ -1878,8 +1878,8 @@ Qt::LayoutDirection QDeclarativeGridView::effectiveLayoutDirection() const Possible values: \list - \o GridView.LeftToRight (default) - Items are laid out from left to right, and the view scrolls vertically - \o GridView.TopToBottom - Items are laid out from top to bottom, and the view scrolls horizontally + \li GridView.LeftToRight (default) - Items are laid out from left to right, and the view scrolls vertically + \li GridView.TopToBottom - Items are laid out from top to bottom, and the view scrolls horizontally \endlist */ QDeclarativeGridView::Flow QDeclarativeGridView::flow() const @@ -2016,10 +2016,10 @@ void QDeclarativeGridView::setCellHeight(int cellHeight) The possible values are: \list - \o GridView.NoSnap (default) - the view stops anywhere within the visible area. - \o GridView.SnapToRow - the view settles with a row (or column for \c GridView.TopToBottom flow) + \li GridView.NoSnap (default) - the view stops anywhere within the visible area. + \li GridView.SnapToRow - the view settles with a row (or column for \c GridView.TopToBottom flow) aligned with the start of the view. - \o GridView.SnapOneRow - the view will settle no more than one row (or column for \c GridView.TopToBottom flow) + \li GridView.SnapOneRow - the view will settle no more than one row (or column for \c GridView.TopToBottom flow) away from the first visible row at the time the mouse button is released. This mode is particularly useful for moving one page at a time. \endlist @@ -2361,7 +2361,7 @@ void QDeclarativeGridView::keyPressEvent(QKeyEvent *event) The current index will wrap if keyNavigationWraps is true and it is currently at the end. This method has no effect if the \l count is zero. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ void QDeclarativeGridView::moveCurrentIndexUp() { @@ -2389,7 +2389,7 @@ void QDeclarativeGridView::moveCurrentIndexUp() The current index will wrap if keyNavigationWraps is true and it is currently at the end. This method has no effect if the \l count is zero. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ void QDeclarativeGridView::moveCurrentIndexDown() { @@ -2417,7 +2417,7 @@ void QDeclarativeGridView::moveCurrentIndexDown() The current index will wrap if keyNavigationWraps is true and it is currently at the end. This method has no effect if the \l count is zero. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ void QDeclarativeGridView::moveCurrentIndexLeft() { @@ -2460,7 +2460,7 @@ void QDeclarativeGridView::moveCurrentIndexLeft() The current index will wrap if keyNavigationWraps is true and it is currently at the end. This method has no effect if the \l count is zero. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ void QDeclarativeGridView::moveCurrentIndexRight() { @@ -2588,12 +2588,12 @@ void QDeclarativeGridViewPrivate::positionViewAtIndex(int index, int mode) \a mode: \list - \o GridView.Beginning - position item at the top (or left for \c GridView.TopToBottom flow) of the view. - \o GridView.Center - position item in the center of the view. - \o GridView.End - position item at bottom (or right for horizontal orientation) of the view. - \o GridView.Visible - if any part of the item is visible then take no action, otherwise + \li GridView.Beginning - position item at the top (or left for \c GridView.TopToBottom flow) of the view. + \li GridView.Center - position item in the center of the view. + \li GridView.End - position item at bottom (or right for horizontal orientation) of the view. + \li GridView.Visible - if any part of the item is visible then take no action, otherwise bring the item into view. - \o GridView.Contain - ensure the entire item is visible. If the item is larger than + \li GridView.Contain - ensure the entire item is visible. If the item is larger than the view the item is positioned at the top (or left for \c GridView.TopToBottom flow) of the view. \endlist @@ -2605,7 +2605,7 @@ void QDeclarativeGridViewPrivate::positionViewAtIndex(int index, int mode) of the view does not cause all other items to be repositioned. The correct way to bring an item into view is with \c positionViewAtIndex. - \bold Note: methods should only be called after the Component has completed. To position + \b Note: methods should only be called after the Component has completed. To position the view at startup, this method should be called by Component.onCompleted. For example, to position the view at the end: @@ -2633,7 +2633,7 @@ void QDeclarativeGridView::positionViewAtIndex(int index, int mode) of the list does not cause all other items to be repositioned, and because the actual start of the view can vary based on the size of the delegates. - \bold Note: methods should only be called after the Component has completed. To position + \b Note: methods should only be called after the Component has completed. To position the view at startup, this method should be called by Component.onCompleted. For example, to position the view at the end on startup: @@ -2667,7 +2667,7 @@ void QDeclarativeGridView::positionViewAtEnd() If the item is outside the visible area, -1 is returned, regardless of whether an item will exist at that point when scrolled into view. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ int QDeclarativeGridView::indexAt(qreal x, qreal y) const { diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp index 90d289ff..375b9503 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp @@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE Images are cached and shared internally, so if several Image elements have the same \l source, only one copy of the image will be loaded. - \bold Note: Images are often the greatest user of memory in QML user interfaces. It is recommended + \b Note: Images are often the greatest user of memory in QML user interfaces. It is recommended that images which do not form part of the user interface have their size bounded via the \l sourceSize property. This is especially important for content that is loaded from external sources or provided by the user. @@ -149,19 +149,19 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) than the item. \list - \o Image.Stretch - the image is scaled to fit - \o Image.PreserveAspectFit - the image is scaled uniformly to fit without cropping - \o Image.PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary - \o Image.Tile - the image is duplicated horizontally and vertically - \o Image.TileVertically - the image is stretched horizontally and tiled vertically - \o Image.TileHorizontally - the image is stretched vertically and tiled horizontally + \li Image.Stretch - the image is scaled to fit + \li Image.PreserveAspectFit - the image is scaled uniformly to fit without cropping + \li Image.PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary + \li Image.Tile - the image is duplicated horizontally and vertically + \li Image.TileVertically - the image is stretched horizontally and tiled vertically + \li Image.TileHorizontally - the image is stretched vertically and tiled horizontally \endlist \table \row - \o \image declarative-qtlogo-stretch.png - \o Stretch (default) + \li \image declarative-qtlogo-stretch.png + \li Stretch (default) \qml Image { width: 130; height: 100 @@ -171,8 +171,8 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endqml \row - \o \image declarative-qtlogo-preserveaspectfit.png - \o PreserveAspectFit + \li \image declarative-qtlogo-preserveaspectfit.png + \li PreserveAspectFit \qml Image { width: 130; height: 100 @@ -183,8 +183,8 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endqml \row - \o \image declarative-qtlogo-preserveaspectcrop.png - \o PreserveAspectCrop + \li \image declarative-qtlogo-preserveaspectcrop.png + \li PreserveAspectCrop \qml Image { width: 130; height: 100 @@ -196,8 +196,8 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endqml \row - \o \image declarative-qtlogo-tile.png - \o Tile + \li \image declarative-qtlogo-tile.png + \li Tile \qml Image { width: 120; height: 120 @@ -207,8 +207,8 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endqml \row - \o \image declarative-qtlogo-tilevertically.png - \o TileVertically + \li \image declarative-qtlogo-tilevertically.png + \li TileVertically \qml Image { width: 120; height: 120 @@ -219,8 +219,8 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endqml \row - \o \image declarative-qtlogo-tilehorizontally.png - \o TileHorizontally + \li \image declarative-qtlogo-tilehorizontally.png + \li TileHorizontally \qml Image { width: 120; height: 120 @@ -282,22 +282,22 @@ qreal QDeclarativeImage::paintedHeight() const This property holds the status of image loading. It can be one of: \list - \o Image.Null - no image has been set - \o Image.Ready - the image has been loaded - \o Image.Loading - the image is currently being loaded - \o Image.Error - an error occurred while loading the image + \li Image.Null - no image has been set + \li Image.Ready - the image has been loaded + \li Image.Loading - the image is currently being loaded + \li Image.Error - an error occurred while loading the image \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: image.status == Image.Ready } \endqml - \o Implement an \c onStatusChanged signal handler: + \li Implement an \c onStatusChanged signal handler: \qml Image { id: image @@ -305,7 +305,7 @@ qreal QDeclarativeImage::paintedHeight() const } \endqml - \o Bind to the status value: + \li Bind to the status value: \qml Text { text: image.status == Image.Ready ? 'Loaded' : 'Not loaded' } \endqml diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 4dd72b8e..a78f8a6a 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -77,9 +77,9 @@ QT_BEGIN_NAMESPACE 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 @@ -583,10 +583,10 @@ void QDeclarativeKeyNavigationAttached::setBacktab(QDeclarativeItem *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 @@ -947,21 +947,21 @@ void QDeclarativeItemPrivate::setLayoutMirror(bool mirror) 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 @@ -984,10 +984,10 @@ void QDeclarativeItemPrivate::setLayoutMirror(bool mirror) 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 @@ -2033,8 +2033,8 @@ void QDeclarativeItem::setClip(bool c) \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 { @@ -2048,8 +2048,8 @@ void QDeclarativeItem::setClip(bool c) } \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 { @@ -2064,8 +2064,8 @@ void QDeclarativeItem::setClip(bool c) } \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 { @@ -2079,8 +2079,8 @@ void QDeclarativeItem::setClip(bool c) } \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 { @@ -2349,8 +2349,8 @@ QDeclarativeAnchorLine QDeclarativeItemPrivate::baseline() const \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 { @@ -2367,8 +2367,8 @@ QDeclarativeAnchorLine QDeclarativeItemPrivate::baseline() const } \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. @@ -2448,8 +2448,8 @@ void QDeclarativeItem::setBaselineOffset(qreal offset) \table \row - \o \image declarative-rotation.png - \o + \li \image declarative-rotation.png + \li \qml Rectangle { color: "blue" @@ -2482,8 +2482,8 @@ void QDeclarativeItem::setBaselineOffset(qreal offset) \table \row - \o \image declarative-scale.png - \o + \li \image declarative-scale.png + \li \qml Rectangle { color: "blue" @@ -2519,8 +2519,8 @@ void QDeclarativeItem::setBaselineOffset(qreal offset) \table \row - \o \image declarative-item_opacity1.png - \o + \li \image declarative-item_opacity1.png + \li \qml Item { Rectangle { @@ -2534,8 +2534,8 @@ void QDeclarativeItem::setBaselineOffset(qreal offset) } \endqml \row - \o \image declarative-item_opacity2.png - \o + \li \image declarative-item_opacity2.png + \li \qml Item { Rectangle { @@ -3509,7 +3509,7 @@ qreal QDeclarativeItem::implicitHeight() 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. */ diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index 2c1b78a2..b94ffd6a 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -2039,13 +2039,13 @@ void QDeclarativeListView::setHighlightFollowsCurrentItem(bool autoHighlight) Valid values for \c highlightRangeMode are: \list - \o ListView.ApplyRange - the view attempts to maintain the highlight within the range. + \li ListView.ApplyRange - the view attempts to maintain the highlight within the range. However, the highlight can move outside of the range at the ends of the list or due to mouse interaction. - \o ListView.StrictlyEnforceRange - the highlight never moves outside of the range. + \li ListView.StrictlyEnforceRange - the highlight never moves outside of the range. The current item changes if a keyboard or mouse action would cause the highlight to move outside of the range. - \o ListView.NoHighlightRange - this is the default value. + \li ListView.NoHighlightRange - this is the default value. \endlist */ qreal QDeclarativeListView::preferredHighlightBegin() const @@ -2148,17 +2148,17 @@ void QDeclarativeListView::setSpacing(qreal spacing) Possible values: \list - \o ListView.Horizontal - Items are laid out horizontally - \o ListView.Vertical (default) - Items are laid out vertically + \li ListView.Horizontal - Items are laid out horizontally + \li ListView.Vertical (default) - Items are laid out vertically \endlist \table \row - \o Horizontal orientation: + \li Horizontal orientation: \image ListViewHorizontal.png \row - \o Vertical orientation: + \li Vertical orientation: \image listview-highlight.png \endtable */ @@ -2194,8 +2194,8 @@ void QDeclarativeListView::setOrientation(QDeclarativeListView::Orientation orie Possible values: \list - \o Qt.LeftToRight (default) - Items will be laid out from left to right. - \o Qt.RightToLeft - Items will be laid out from right to let. + \li Qt.LeftToRight (default) - Items will be laid out from left to right. + \li Qt.RightToLeft - Items will be laid out from right to let. \endlist When using the attached property \l {LayoutMirroring::enabled} for locale layouts, @@ -2312,9 +2312,9 @@ void QDeclarativeListView::setCacheBuffer(int b) \c section.property. This value can be one of: \list - \o ViewSection.FullString (default) - sections are created based on the + \li ViewSection.FullString (default) - sections are created based on the \c section.property value. - \o ViewSection.FirstCharacter - sections are created based on the first + \li ViewSection.FirstCharacter - sections are created based on the first character of the \c section.property value (for example, 'A', 'B', 'C' sections, etc. for an address book) \endlist @@ -2459,10 +2459,10 @@ void QDeclarativeListView::setHighlightResizeDuration(int duration) The possible values are: \list - \o ListView.NoSnap (default) - the view stops anywhere within the visible area. - \o ListView.SnapToItem - the view settles with an item aligned with the start of + \li ListView.NoSnap (default) - the view stops anywhere within the visible area. + \li ListView.SnapToItem - the view settles with an item aligned with the start of the view. - \o ListView.SnapOneItem - the view settles no more than one item away from the first + \li ListView.SnapOneItem - the view settles no more than one item away from the first visible item at the time the mouse button is released. This mode is particularly useful for moving one page at a time. \endlist @@ -2879,7 +2879,7 @@ void QDeclarativeListView::geometryChanged(const QRectF &newGeometry, if keyNavigationWraps is true and it is currently at the end. This method has no effect if the \l count is zero. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ void QDeclarativeListView::incrementCurrentIndex() { @@ -2899,7 +2899,7 @@ void QDeclarativeListView::incrementCurrentIndex() if keyNavigationWraps is true and it is currently at the beginning. This method has no effect if the \l count is zero. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ void QDeclarativeListView::decrementCurrentIndex() { @@ -3001,12 +3001,12 @@ void QDeclarativeListViewPrivate::positionViewAtIndex(int index, int mode) \a mode: \list - \o ListView.Beginning - position item at the top (or left for horizontal orientation) of the view. - \o ListView.Center - position item in the center of the view. - \o ListView.End - position item at bottom (or right for horizontal orientation) of the view. - \o ListView.Visible - if any part of the item is visible then take no action, otherwise + \li ListView.Beginning - position item at the top (or left for horizontal orientation) of the view. + \li ListView.Center - position item in the center of the view. + \li ListView.End - position item at bottom (or right for horizontal orientation) of the view. + \li ListView.Visible - if any part of the item is visible then take no action, otherwise bring the item into view. - \o ListView.Contain - ensure the entire item is visible. If the item is larger than + \li ListView.Contain - ensure the entire item is visible. If the item is larger than the view the item is positioned at the top (or left for horizontal orientation) of the view. \endlist @@ -3019,7 +3019,7 @@ void QDeclarativeListViewPrivate::positionViewAtIndex(int index, int mode) the actual start of the view can vary based on the size of the delegates. The correct way to bring an item into view is with \c positionViewAtIndex. - \bold Note: methods should only be called after the Component has completed. To position + \b Note: methods should only be called after the Component has completed. To position the view at startup, this method should be called by Component.onCompleted. For example, to position the view at the end: @@ -3047,7 +3047,7 @@ void QDeclarativeListView::positionViewAtIndex(int index, int mode) of the list does not cause all other items to be repositioned, and because the actual start of the view can vary based on the size of the delegates. - \bold Note: methods should only be called after the Component has completed. To position + \b Note: methods should only be called after the Component has completed. To position the view at startup, this method should be called by Component.onCompleted. For example, to position the view at the end on startup: @@ -3081,7 +3081,7 @@ void QDeclarativeListView::positionViewAtEnd() If the item is outside the visible area, -1 is returned, regardless of whether an item will exist at that point when scrolled into view. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ int QDeclarativeListView::indexAt(qreal x, qreal y) const { diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp index dba95f77..b6cd323d 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader.cpp +++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp @@ -150,10 +150,10 @@ void QDeclarativeLoaderPrivate::initResize() accordingly to become visible. \list - \o If an explicit size is not specified for the Loader, the Loader + \li If an explicit size is not specified for the Loader, the Loader is automatically resized to the size of the loaded item once the component is loaded. - \o If the size of the Loader is specified explicitly by setting + \li If the size of the Loader is specified explicitly by setting the width, height or by anchoring, the loaded item will be resized to the size of the Loader. \endlist @@ -164,14 +164,14 @@ void QDeclarativeLoaderPrivate::initResize() \table \row - \o sizeloader.qml - \o sizeitem.qml + \li sizeloader.qml + \li sizeitem.qml \row - \o \snippet doc/src/snippets/declarative/loader/sizeloader.qml 0 - \o \snippet doc/src/snippets/declarative/loader/sizeitem.qml 0 + \li \snippet doc/src/snippets/declarative/loader/sizeloader.qml 0 + \li \snippet doc/src/snippets/declarative/loader/sizeitem.qml 0 \row - \o The red rectangle will be sized to the size of the root item. - \o The red rectangle will be 50x50, centered in the root item. + \li The red rectangle will be sized to the size of the root item. + \li The red rectangle will be 50x50, centered in the root item. \endtable @@ -184,11 +184,11 @@ void QDeclarativeLoaderPrivate::initResize() \table \row - \o application.qml - \o MyItem.qml + \li application.qml + \li MyItem.qml \row - \o \snippet doc/src/snippets/declarative/loader/connections.qml 0 - \o \snippet doc/src/snippets/declarative/loader/MyItem.qml 0 + \li \snippet doc/src/snippets/declarative/loader/connections.qml 0 + \li \snippet doc/src/snippets/declarative/loader/MyItem.qml 0 \endtable Alternatively, since \c MyItem.qml is loaded within the scope of the @@ -211,11 +211,11 @@ void QDeclarativeLoaderPrivate::initResize() \table \row - \o application.qml - \o KeyReader.qml + \li application.qml + \li KeyReader.qml \row - \o \snippet doc/src/snippets/declarative/loader/focus.qml 0 - \o \snippet doc/src/snippets/declarative/loader/KeyReader.qml 0 + \li \snippet doc/src/snippets/declarative/loader/focus.qml 0 + \li \snippet doc/src/snippets/declarative/loader/KeyReader.qml 0 \endtable Once \c KeyReader.qml is loaded, it accepts key events and sets @@ -429,22 +429,22 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded() This property holds the status of QML loading. It can be one of: \list - \o Loader.Null - no QML source has been set - \o Loader.Ready - the QML source has been loaded - \o Loader.Loading - the QML source is currently being loaded - \o Loader.Error - an error occurred while loading the QML source + \li Loader.Null - no QML source has been set + \li Loader.Ready - the QML source has been loaded + \li Loader.Loading - the QML source is currently being loaded + \li Loader.Error - an error occurred while loading the QML source \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 == Loader.Ready } \endqml - \o Implement an \c onStatusChanged signal handler: + \li Implement an \c onStatusChanged signal handler: \qml Loader { id: loader @@ -452,7 +452,7 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded() } \endqml - \o Bind to the status value: + \li Bind to the status value: \qml Text { text: loader.status == Loader.Ready ? 'Loaded' : 'Not loaded' } \endqml diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index 8026f89b..ca6ba511 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -378,8 +378,8 @@ QDeclarativeMouseArea::~QDeclarativeMouseArea() If hoverEnabled is true then these properties will be valid when: \list - \i no button is pressed, but the mouse is within the MouseArea (containsMouse is true). - \i a button is pressed and held, even if it has since moved out of the area. + \li no button is pressed, but the mouse is within the MouseArea (containsMouse is true). + \li a button is pressed and held, even if it has since moved out of the area. \endlist The coordinates are relative to the MouseArea. @@ -456,9 +456,9 @@ void QDeclarativeMouseArea::setPreventStealing(bool prevent) It contains a bitwise combination of: \list - \o Qt.LeftButton - \o Qt.RightButton - \o Qt.MiddleButton + \li Qt.LeftButton + \li Qt.RightButton + \li Qt.MiddleButton \endlist The code below displays "right" when the right mouse buttons is pressed: @@ -883,9 +883,9 @@ void QDeclarativeMouseArea::setHovered(bool h) The available buttons are: \list - \o Qt.LeftButton - \o Qt.RightButton - \o Qt.MiddleButton + \li Qt.LeftButton + \li Qt.RightButton + \li Qt.MiddleButton \endlist To accept more than one button the flags can be combined with the @@ -961,10 +961,10 @@ QDeclarativeDrag *QDeclarativeMouseArea::drag() \c drag provides a convenient way to make an item draggable. \list - \i \c drag.target specifies the id of the item to drag. - \i \c drag.active specifies if the target item is currently being dragged. - \i \c drag.axis specifies whether dragging can be done horizontally (\c Drag.XAxis), vertically (\c Drag.YAxis), or both (\c Drag.XandYAxis) - \i \c drag.minimum and \c drag.maximum limit how far the target can be dragged along the corresponding axes. + \li \c drag.target specifies the id of the item to drag. + \li \c drag.active specifies if the target item is currently being dragged. + \li \c drag.axis specifies whether dragging can be done horizontally (\c Drag.XAxis), vertically (\c Drag.YAxis), or both (\c Drag.XandYAxis) + \li \c drag.minimum and \c drag.maximum limit how far the target can be dragged along the corresponding axes. \endlist The following example displays a \l Rectangle that can be dragged along the X-axis. The opacity diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp index aa781c53..0b7c1458 100644 --- a/src/declarative/graphicsitems/qdeclarativepath.cpp +++ b/src/declarative/graphicsitems/qdeclarativepath.cpp @@ -144,11 +144,11 @@ bool QDeclarativePath::isClosed() const A path can contain the following path objects: \list - \i \l PathLine - a straight line to a given position. - \i \l PathQuad - a quadratic Bezier curve to a given position with a control point. - \i \l PathCubic - a cubic Bezier curve to a given position with two control points. - \i \l PathAttribute - an attribute at a given position in the path. - \i \l PathPercent - a way to spread out items along various segments of the path. + \li \l PathLine - a straight line to a given position. + \li \l PathQuad - a quadratic Bezier curve to a given position with a control point. + \li \l PathCubic - a cubic Bezier curve to a given position with two control points. + \li \l PathAttribute - an attribute at a given position in the path. + \li \l PathPercent - a way to spread out items along various segments of the path. \endlist \snippet doc/src/snippets/declarative/pathview/pathattributes.qml 2 @@ -512,8 +512,8 @@ void QDeclarativeCurve::setY(qreal y) \table \row - \o \image declarative-pathattribute.png - \o + \li \image declarative-pathattribute.png + \li \snippet doc/src/snippets/declarative/pathview/pathattributes.qml 0 (see the PathView documentation for the specification of ContactModel.qml used for ContactModel above.) @@ -649,8 +649,8 @@ void QDeclarativePathLine::addToPath(QPainterPath &path) The following QML produces the path shown below: \table \row - \o \image declarative-pathquad.png - \o + \li \image declarative-pathquad.png + \li \qml Path { startX: 0; startY: 0 @@ -727,8 +727,8 @@ void QDeclarativePathQuad::addToPath(QPainterPath &path) The following QML produces the path shown below: \table \row - \o \image declarative-pathcubic.png - \o + \li \image declarative-pathcubic.png + \li \qml Path { startX: 20; startY: 0 @@ -841,8 +841,8 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path) PathLine section of the path. \table \row - \o \image declarative-nopercent.png - \o + \li \image declarative-nopercent.png + \li \qml PathView { // ... @@ -855,8 +855,8 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path) } \endqml \row - \o \image declarative-percent.png - \o + \li \image declarative-percent.png + \li \qml PathView { // ... diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index ba1097c6..0d4d1caf 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -403,7 +403,7 @@ void QDeclarativePathViewPrivate::regenerate() \snippet doc/src/snippets/declarative/pathview/pathview.qml 1 - \bold Note that views do not enable \e clip automatically. If the view + \b Note that views do not enable \e clip automatically. If the view is not clipped by another item or the screen, it will be necessary to set \e {clip: true} in order to have the out of view items clipped nicely. @@ -628,7 +628,7 @@ void QDeclarativePathView::setCurrentIndex(int idx) Increments the current index. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ void QDeclarativePathView::incrementCurrentIndex() { @@ -643,7 +643,7 @@ void QDeclarativePathView::incrementCurrentIndex() Decrements the current index. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ void QDeclarativePathView::decrementCurrentIndex() { diff --git a/src/declarative/graphicsitems/qdeclarativepincharea.cpp b/src/declarative/graphicsitems/qdeclarativepincharea.cpp index d33c8934..adff025f 100644 --- a/src/declarative/graphicsitems/qdeclarativepincharea.cpp +++ b/src/declarative/graphicsitems/qdeclarativepincharea.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE \ingroup qml-event-elements \brief The PinchEvent object provides information about a pinch event. - \bold {The PinchEvent element was added in QtQuick 1.1} + \b {The PinchEvent element was added in QtQuick 1.1} The \c center, \c startCenter, \c previousCenter properties provide the center position between the two touch points. @@ -80,9 +80,9 @@ QT_BEGIN_NAMESPACE These properties hold the position of the center point between the two touch points. \list - \o \c center is the current center point - \o \c previousCenter is the center point of the previous event. - \o \c startCenter is the center point when the gesture began + \li \c center is the current center point + \li \c previousCenter is the center point of the previous event. + \li \c startCenter is the center point when the gesture began \endlist */ @@ -93,8 +93,8 @@ QT_BEGIN_NAMESPACE These properties hold the scale factor determined by the change in distance between the two touch points. \list - \o \c scale is the current scale factor. - \o \c previousScale is the scale factor of the previous event. + \li \c scale is the current scale factor. + \li \c previousScale is the scale factor of the previous event. \endlist When a pinch gesture is started, the scale is 1.0. @@ -108,9 +108,9 @@ QT_BEGIN_NAMESPACE These properties hold the angle between the two touch points. \list - \o \c angle is the current angle between the two points in the range -180 to 180. - \o \c previousAngle is the angle of the previous event. - \o \c rotation is the total rotation since the pinch gesture started. + \li \c angle is the current angle between the two points in the range -180 to 180. + \li \c previousAngle is the angle of the previous event. + \li \c rotation is the total rotation since the pinch gesture started. \endlist When a pinch gesture is started, the rotation is 0.0. @@ -125,8 +125,8 @@ QT_BEGIN_NAMESPACE These properties provide the actual touch points generating the pinch. \list - \o \c point1 and \c point2 hold the current positions of the points. - \o \c startPoint1 and \c startPoint2 hold the positions of the points when the second point was touched. + \li \c point1 and \c point2 hold the current positions of the points. + \li \c startPoint1 and \c startPoint2 hold the positions of the points when the second point was touched. \endlist */ @@ -164,7 +164,7 @@ QDeclarativePinchAreaPrivate::~QDeclarativePinchAreaPrivate() \brief The PinchArea item enables simple pinch gesture handling. \inherits Item - \bold {The PinchArea element was added in QtQuick 1.1} + \b {The PinchArea element was added in QtQuick 1.1} A PinchArea is an invisible item that is typically used in conjunction with a visible item in order to provide pinch gesture handling for that item. @@ -176,8 +176,8 @@ QDeclarativePinchAreaPrivate::~QDeclarativePinchAreaPrivate() PinchArea can be used in two ways: \list - \o setting a \c pinch.target to provide automatic interaction with an element - \o using the onPinchStarted, onPinchUpdated and onPinchFinished handlers + \li setting a \c pinch.target to provide automatic interaction with an element + \li using the onPinchStarted, onPinchUpdated and onPinchFinished handlers \endlist \sa PinchEvent @@ -230,12 +230,12 @@ QDeclarativePinchAreaPrivate::~QDeclarativePinchAreaPrivate() \c pinch provides a convenient way to make an item react to pinch gestures. \list - \i \c pinch.target specifies the id of the item to drag. - \i \c pinch.active specifies if the target item is currently being dragged. - \i \c pinch.minimumScale and \c pinch.maximumScale limit the range of the Item::scale property. - \i \c pinch.minimumRotation and \c pinch.maximumRotation limit the range of the Item::rotation property. - \i \c pinch.dragAxis specifies whether dragging in not allowed (\c Pinch.NoDrag), can be done horizontally (\c Pinch.XAxis), vertically (\c Pinch.YAxis), or both (\c Pinch.XandYAxis) - \i \c pinch.minimum and \c pinch.maximum limit how far the target can be dragged along the corresponding axes. + \li \c pinch.target specifies the id of the item to drag. + \li \c pinch.active specifies if the target item is currently being dragged. + \li \c pinch.minimumScale and \c pinch.maximumScale limit the range of the Item::scale property. + \li \c pinch.minimumRotation and \c pinch.maximumRotation limit the range of the Item::rotation property. + \li \c pinch.dragAxis specifies whether dragging in not allowed (\c Pinch.NoDrag), can be done horizontally (\c Pinch.XAxis), vertically (\c Pinch.YAxis), or both (\c Pinch.XandYAxis) + \li \c pinch.minimum and \c pinch.maximum limit how far the target can be dragged along the corresponding axes. \endlist */ diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index 6ee0db00..41605b87 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -591,9 +591,9 @@ QDeclarativeRow::QDeclarativeRow(QDeclarativeItem *parent) Possible values: \list - \o Qt.LeftToRight (default) - Items are laid out from left to right. If the width of the row is explicitly set, + \li Qt.LeftToRight (default) - Items are laid out from left to right. If the width of the row is explicitly set, the left anchor remains to the left of the row. - \o Qt.RightToLeft - Items are laid out from right to left. If the width of the row is explicitly set, + \li Qt.RightToLeft - Items are laid out from right to left. If the width of the row is explicitly set, the right anchor remains to the right of the row. \endlist @@ -856,9 +856,9 @@ void QDeclarativeGrid::setRows(const int rows) Possible values are: \list - \o Grid.LeftToRight (default) - Items are positioned next to + \li Grid.LeftToRight (default) - Items are positioned next to each other in the \l layoutDirection, then wrapped to the next line. - \o Grid.TopToBottom - Items are positioned next to each + \li Grid.TopToBottom - Items are positioned next to each other from top to bottom, then wrapped to the next column. \endlist */ @@ -885,10 +885,10 @@ void QDeclarativeGrid::setFlow(Flow flow) Possible values are: \list - \o Qt.LeftToRight (default) - Items are positioned from the top to bottom, + \li Qt.LeftToRight (default) - Items are positioned from the top to bottom, and left to right. The flow direction is dependent on the \l Grid::flow property. - \o Qt.RightToLeft - Items are positioned from the top to bottom, + \li Qt.RightToLeft - Items are positioned from the top to bottom, and right to left. The flow direction is dependent on the \l Grid::flow property. \endlist @@ -1210,10 +1210,10 @@ QDeclarativeFlow::QDeclarativeFlow(QDeclarativeItem *parent) Possible values are: \list - \o Flow.LeftToRight (default) - Items are positioned next to + \li Flow.LeftToRight (default) - Items are positioned next to to each other according to the \l layoutDirection until the width of the Flow is exceeded, then wrapped to the next line. - \o Flow.TopToBottom - Items are positioned next to each + \li Flow.TopToBottom - Items are positioned next to each other from top to bottom until the height of the Flow is exceeded, then wrapped to the next column. \endlist @@ -1243,10 +1243,10 @@ void QDeclarativeFlow::setFlow(Flow flow) Possible values are: \list - \o Qt.LeftToRight (default) - Items are positioned from the top to bottom, + \li Qt.LeftToRight (default) - Items are positioned from the top to bottom, and left to right. The flow direction is dependent on the \l Flow::flow property. - \o Qt.RightToLeft - Items are positioned from the top to bottom, + \li Qt.RightToLeft - Items are positioned from the top to bottom, and right to left. The flow direction is dependent on the \l Flow::flow property. \endlist diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index 8a07a2a3..07950fba 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -164,10 +164,10 @@ QDeclarativeRepeater::~QDeclarativeRepeater() This property can be set to any of the supported \l {qmlmodels}{data models}: \list - \o A number that indicates the number of delegates to be created by the repeater - \o A model (e.g. a ListModel item, or a QAbstractItemModel subclass) - \o A string list - \o An object list + \li A number that indicates the number of delegates to be created by the repeater + \li A model (e.g. a ListModel item, or a QAbstractItemModel subclass) + \li A string list + \li An object list \endlist The type of model affects the properties that are exposed to the \l delegate. @@ -241,8 +241,8 @@ void QDeclarativeRepeater::setModel(const QVariant &model) \table \row - \o \snippet doc/src/snippets/declarative/repeaters/repeater.qml index - \o \image repeater-index.png + \li \snippet doc/src/snippets/declarative/repeaters/repeater.qml index + \li \image repeater-index.png \endtable If the \l model is a \l{QStringList-based model}{string list} or @@ -252,8 +252,8 @@ void QDeclarativeRepeater::setModel(const QVariant &model) \table \row - \o \snippet doc/src/snippets/declarative/repeaters/repeater.qml modeldata - \o \image repeater-modeldata.png + \li \snippet doc/src/snippets/declarative/repeaters/repeater.qml modeldata + \li \image repeater-modeldata.png \endtable If the \l model is a model object (such as a \l ListModel) the delegate diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index 689a75e3..a94cb14b 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -777,11 +777,11 @@ QDeclarativeText::~QDeclarativeText() The weight can be one of: \list - \o Font.Light - \o Font.Normal - the default - \o Font.DemiBold - \o Font.Bold - \o Font.Black + \li Font.Light + \li Font.Normal - the default + \li Font.DemiBold + \li Font.Bold + \li Font.Black \endlist \qml @@ -847,11 +847,11 @@ QDeclarativeText::~QDeclarativeText() Sets the capitalization for the text. \list - \o Font.MixedCase - This is the normal text rendering option where no capitalization change is applied. - \o Font.AllUppercase - This alters the text to be rendered in all uppercase type. - \o Font.AllLowercase - This alters the text to be rendered in all lowercase type. - \o Font.SmallCaps - This alters the text to be rendered in small-caps type. - \o Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character. + \li Font.MixedCase - This is the normal text rendering option where no capitalization change is applied. + \li Font.AllUppercase - This alters the text to be rendered in all uppercase type. + \li Font.AllLowercase - This alters the text to be rendered in all lowercase type. + \li Font.SmallCaps - This alters the text to be rendered in small-caps type. + \li Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character. \endlist \qml @@ -967,10 +967,10 @@ void QDeclarativeText::setColor(const QColor &color) Supported text styles are: \list - \o Text.Normal - the default - \o Text.Outline - \o Text.Raised - \o Text.Sunken + \li Text.Normal - the default + \li Text.Outline + \li Text.Raised + \li Text.Sunken \endlist \qml @@ -1163,10 +1163,10 @@ void QDeclarativeText::setVAlign(VAlignment align) wrap if an explicit width has been set. wrapMode can be one of: \list - \o Text.NoWrap (default) - no wrapping will be performed. If the text contains insufficient newlines, then \l paintedWidth will exceed a set width. - \o Text.WordWrap - wrapping is done on word boundaries only. If a word is too long, \l paintedWidth will exceed a set width. - \o Text.WrapAnywhere - wrapping is done at any point on a line, even if it occurs in the middle of a word. - \o Text.Wrap - if possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word. + \li Text.NoWrap (default) - no wrapping will be performed. If the text contains insufficient newlines, then \l paintedWidth will exceed a set width. + \li Text.WordWrap - wrapping is done on word boundaries only. If a word is too long, \l paintedWidth will exceed a set width. + \li Text.WrapAnywhere - wrapping is done at any point on a line, even if it occurs in the middle of a word. + \li Text.Wrap - if possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word. \endlist */ QDeclarativeText::WrapMode QDeclarativeText::wrapMode() const @@ -1269,10 +1269,10 @@ void QDeclarativeText::resetMaximumLineCount() Supported text formats are: \list - \o Text.AutoText (default) - \o Text.PlainText - \o Text.RichText - \o Text.StyledText + \li Text.AutoText (default) + \li Text.PlainText + \li Text.RichText + \li Text.StyledText \endlist If the text format is \c Text.AutoText the text element @@ -1294,7 +1294,7 @@ void QDeclarativeText::resetMaximumLineCount() \table \row - \o + \li \qml Column { Text { @@ -1313,7 +1313,7 @@ Column { } } \endqml - \o \image declarative-textformat.png + \li \image declarative-textformat.png \endtable */ QDeclarativeText::TextFormat QDeclarativeText::textFormat() const @@ -1351,10 +1351,10 @@ void QDeclarativeText::setTextFormat(TextFormat format) Eliding can be: \list - \o Text.ElideNone - the default - \o Text.ElideLeft - \o Text.ElideMiddle - \o Text.ElideRight + \li Text.ElideNone - the default + \li Text.ElideLeft + \li Text.ElideMiddle + \li Text.ElideRight \endlist If this property is set to Text.ElideRight, it can be used with multiline @@ -1489,9 +1489,9 @@ void QDeclarativeText::setLineHeight(qreal lineHeight) The possible values are: \list - \o Text.ProportionalHeight (default) - this sets the spacing proportional to the + \li Text.ProportionalHeight (default) - this sets the spacing proportional to the line (as a multiplier). For example, set to 2 for double spacing. - \o Text.FixedHeight - this sets the line height to a fixed line height (in pixels). + \li Text.FixedHeight - this sets the line height to a fixed line height (in pixels). \endlist */ QDeclarativeText::LineHeightMode QDeclarativeText::lineHeightMode() const diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 38bc4531..978e25db 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -156,11 +156,11 @@ QString QDeclarativeTextEdit::text() const The weight can be one of: \list - \o Font.Light - \o Font.Normal - the default - \o Font.DemiBold - \o Font.Bold - \o Font.Black + \li Font.Light + \li Font.Normal - the default + \li Font.DemiBold + \li Font.Bold + \li Font.Black \endlist \qml @@ -227,11 +227,11 @@ QString QDeclarativeTextEdit::text() const Sets the capitalization for the text. \list - \o Font.MixedCase - This is the normal text rendering option where no capitalization change is applied. - \o Font.AllUppercase - This alters the text to be rendered in all uppercase type. - \o Font.AllLowercase - This alters the text to be rendered in all lowercase type. - \o Font.SmallCaps - This alters the text to be rendered in small-caps type. - \o Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character. + \li Font.MixedCase - This is the normal text rendering option where no capitalization change is applied. + \li Font.AllUppercase - This alters the text to be rendered in all uppercase type. + \li Font.AllLowercase - This alters the text to be rendered in all lowercase type. + \li Font.SmallCaps - This alters the text to be rendered in small-caps type. + \li Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character. \endlist \qml @@ -271,9 +271,9 @@ void QDeclarativeTextEdit::setText(const QString &text) The way the text property should be displayed. \list - \o TextEdit.AutoText - \o TextEdit.PlainText - \o TextEdit.RichText + \li TextEdit.AutoText + \li TextEdit.PlainText + \li TextEdit.RichText \endlist The default is TextEdit.AutoText. If the text format is TextEdit.AutoText the text edit @@ -282,7 +282,7 @@ void QDeclarativeTextEdit::setText(const QString &text) \table \row - \o + \li \qml Column { TextEdit { @@ -301,7 +301,7 @@ Column { } } \endqml - \o \image declarative-textformat.png + \li \image declarative-textformat.png \endtable */ QDeclarativeTextEdit::TextFormat QDeclarativeTextEdit::textFormat() const @@ -467,17 +467,17 @@ void QDeclarativeTextEdit::setSelectedTextColor(const QColor &color) Valid values for \c horizontalAlignment are: \list - \o TextEdit.AlignLeft (default) - \o TextEdit.AlignRight - \o TextEdit.AlignHCenter - \o TextEdit.AlignJustify + \li TextEdit.AlignLeft (default) + \li TextEdit.AlignRight + \li TextEdit.AlignHCenter + \li TextEdit.AlignJustify \endlist Valid values for \c verticalAlignment are: \list - \o TextEdit.AlignTop (default) - \o TextEdit.AlignBottom - \o TextEdit.AlignVCenter + \li TextEdit.AlignTop (default) + \li TextEdit.AlignBottom + \li TextEdit.AlignVCenter \endlist When using the attached property \l {LayoutMirroring::enabled} to mirror application @@ -599,10 +599,10 @@ void QDeclarativeTextEdit::setVAlign(QDeclarativeTextEdit::VAlignment alignment) The text will only wrap if an explicit width has been set. \list - \o TextEdit.NoWrap - no wrapping will be performed. If the text contains insufficient newlines, then implicitWidth will exceed a set width. - \o TextEdit.WordWrap - wrapping is done on word boundaries only. If a word is too long, implicitWidth will exceed a set width. - \o TextEdit.WrapAnywhere - wrapping is done at any point on a line, even if it occurs in the middle of a word. - \o TextEdit.Wrap - if possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word. + \li TextEdit.NoWrap - no wrapping will be performed. If the text contains insufficient newlines, then implicitWidth will exceed a set width. + \li TextEdit.WordWrap - wrapping is done on word boundaries only. If a word is too long, implicitWidth will exceed a set width. + \li TextEdit.WrapAnywhere - wrapping is done at any point on a line, even if it occurs in the middle of a word. + \li TextEdit.Wrap - if possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word. \endlist The default is TextEdit.NoWrap. If you set a width, consider using TextEdit.Wrap. @@ -734,9 +734,9 @@ void QDeclarativeTextEdit::moveCursorSelection(int pos) basis. If not specified the selection mode will default to TextEdit.SelectCharacters. \list - \o TextEdit.SelectCharacters - Sets either the selectionStart or selectionEnd (whichever was at + \li TextEdit.SelectCharacters - Sets either the selectionStart or selectionEnd (whichever was at the previous cursor position) to the specified position. - \o TextEdit.SelectWords - Sets the selectionStart and selectionEnd to include all + \li TextEdit.SelectWords - Sets the selectionStart and selectionEnd to include all words between the specified postion and the previous cursor position. Words partially in the range are included. \endlist @@ -1090,8 +1090,8 @@ void QDeclarativeTextEdit::setSelectByMouse(bool on) Specifies how text should be selected using a mouse. \list - \o TextEdit.SelectCharacters - The selection is updated with individual characters. (Default) - \o TextEdit.SelectWords - The selection is updated with whole words. + \li TextEdit.SelectCharacters - The selection is updated with individual characters. (Default) + \li TextEdit.SelectWords - The selection is updated with whole words. \endlist This property only applies when \l selectByMouse is true. diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index ad43cd48..ce75617d 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -133,11 +133,11 @@ void QDeclarativeTextInput::setText(const QString &s) The weight can be one of: \list - \o Font.Light - \o Font.Normal - the default - \o Font.DemiBold - \o Font.Bold - \o Font.Black + \li Font.Light + \li Font.Normal - the default + \li Font.DemiBold + \li Font.Bold + \li Font.Black \endlist \qml @@ -203,11 +203,11 @@ void QDeclarativeTextInput::setText(const QString &s) Sets the capitalization for the text. \list - \o Font.MixedCase - This is the normal text rendering option where no capitalization change is applied. - \o Font.AllUppercase - This alters the text to be rendered in all uppercase type. - \o Font.AllLowercase - This alters the text to be rendered in all lowercase type. - \o Font.SmallCaps - This alters the text to be rendered in small-caps type. - \o Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character. + \li Font.MixedCase - This is the normal text rendering option where no capitalization change is applied. + \li Font.AllUppercase - This alters the text to be rendered in all uppercase type. + \li Font.AllLowercase - This alters the text to be rendered in all lowercase type. + \li Font.SmallCaps - This alters the text to be rendered in small-caps type. + \li Font.Capitalize - This alters the text to be rendered with the first character of each word as an uppercase character. \endlist \qml @@ -737,8 +737,8 @@ void QDeclarativeTextInput::setAutoScroll(bool b) The possible values for this property are: \list - \o DoubleValidator.StandardNotation - \o DoubleValidator.ScientificNotation (default) + \li DoubleValidator.StandardNotation + \li DoubleValidator.ScientificNotation (default) \endlist If this property is set to DoubleValidator.ScientificNotation, the written number may have an exponent part (e.g. 1.5E-2). @@ -877,10 +877,10 @@ void QDeclarativeTextInputPrivate::updateInputMethodHints() Specifies how the text should be displayed in the TextInput. \list - \o TextInput.Normal - Displays the text as it is. (Default) - \o TextInput.Password - Displays asterixes instead of characters. - \o TextInput.NoEcho - Displays nothing. - \o TextInput.PasswordEchoOnEdit - Displays characters as they are entered + \li TextInput.Normal - Displays the text as it is. (Default) + \li TextInput.Password - Displays asterixes instead of characters. + \li TextInput.NoEcho - Displays nothing. + \li TextInput.PasswordEchoOnEdit - Displays characters as they are entered while editing, otherwise displays asterisks. \endlist */ @@ -1030,8 +1030,8 @@ int QDeclarativeTextInput::positionAt(int x) const The cursor position type specifies how the cursor position should be resolved. \list - \o TextInput.CursorBetweenCharacters - Returns the position between characters that is nearest x. - \o TextInput.CursorOnCharacter - Returns the position before the character that is nearest x. + \li TextInput.CursorBetweenCharacters - Returns the position between characters that is nearest x. + \li TextInput.CursorOnCharacter - Returns the position before the character that is nearest x. \endlist */ int QDeclarativeTextInput::positionAt(int x, CursorPosition position) const @@ -1579,8 +1579,8 @@ void QDeclarativeTextInput::setSelectByMouse(bool on) Specifies how text should be selected using a mouse. \list - \o TextInput.SelectCharacters - The selection is updated with individual characters. (Default) - \o TextInput.SelectWords - The selection is updated with whole words. + \li TextInput.SelectCharacters - The selection is updated with individual characters. (Default) + \li TextInput.SelectWords - The selection is updated with whole words. \endlist This property only applies when \l selectByMouse is true. @@ -1636,9 +1636,9 @@ void QDeclarativeTextInput::moveCursorSelection(int position) basis. If not specified the selection mode will default to TextInput.SelectCharacters. \list - \o TextEdit.SelectCharacters - Sets either the selectionStart or selectionEnd (whichever was at + \li TextEdit.SelectCharacters - Sets either the selectionStart or selectionEnd (whichever was at the previous cursor position) to the specified position. - \o TextEdit.SelectWords - Sets the selectionStart and selectionEnd to include all + \li TextEdit.SelectWords - Sets the selectionStart and selectionEnd to include all words between the specified postion and the previous cursor position. Words partially in the range are included. \endlist diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index ffd5dfb8..3a219be2 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -320,10 +320,10 @@ QDeclarativeComponent::~QDeclarativeComponent() \qmlproperty enumeration Component::status This property holds the status of component loading. It can be one of: \list - \o Component.Null - no data is available for the component - \o Component.Ready - the component has been loaded, and can be used to create instances. - \o Component.Loading - the component is currently being loaded - \o Component.Error - an error occurred while loading the component. + \li Component.Null - no data is available for the component + \li Component.Ready - the component has been loaded, and can be used to create instances. + \li Component.Loading - the component is currently being loaded + \li Component.Error - an error occurred while loading the component. Calling errorString() will provide a human-readable description of any errors. \endlist */ @@ -780,9 +780,9 @@ QObject *QDeclarativeComponent::create(QDeclarativeContext *context) When QDeclarativeComponent constructs an instance, it occurs in three steps: \list 1 - \i The object hierarchy is created, and constant values are assigned. - \i Property bindings are evaluated for the the first time. - \i If applicable, QDeclarativeParserStatus::componentComplete() is called on objects. + \li The object hierarchy is created, and constant values are assigned. + \li Property bindings are evaluated for the the first time. + \li If applicable, QDeclarativeParserStatus::componentComplete() is called on objects. \endlist QDeclarativeComponent::beginCreate() differs from QDeclarativeComponent::create() in that it only performs step 1. QDeclarativeComponent::completeCreate() must be called to diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp index 1dee77ae..7729e513 100644 --- a/src/declarative/qml/qdeclarativecontext.cpp +++ b/src/declarative/qml/qdeclarativecontext.cpp @@ -330,7 +330,7 @@ void QDeclarativeContext::setContextProperty(const QString &name, const QVariant /*! Set the \a value of the \a name property on this context. - QDeclarativeContext does \bold not take ownership of \a value. + QDeclarativeContext does \b not take ownership of \a value. */ void QDeclarativeContext::setContextProperty(const QString &name, QObject *value) { diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index bee27817..3b77c18b 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -231,11 +231,11 @@ data types. This is primarily useful when setting the properties of an item when the property has one of the following types: \list -\o \c color - use \l{QML:Qt::rgba()}{Qt.rgba()}, \l{QML:Qt::hsla()}{Qt.hsla()}, \l{QML:Qt::darker()}{Qt.darker()}, \l{QML:Qt::lighter()}{Qt.lighter()} or \l{QML:Qt::tint()}{Qt.tint()} -\o \c rect - use \l{QML:Qt::rect()}{Qt.rect()} -\o \c point - use \l{QML:Qt::point()}{Qt.point()} -\o \c size - use \l{QML:Qt::size()}{Qt.size()} -\o \c vector3d - use \l{QML:Qt::vector3d()}{Qt.vector3d()} +\li \c color - use \l{QML:Qt::rgba()}{Qt.rgba()}, \l{QML:Qt::hsla()}{Qt.hsla()}, \l{QML:Qt::darker()}{Qt.darker()}, \l{QML:Qt::lighter()}{Qt.lighter()} or \l{QML:Qt::tint()}{Qt.tint()} +\li \c rect - use \l{QML:Qt::rect()}{Qt.rect()} +\li \c point - use \l{QML:Qt::point()}{Qt.point()} +\li \c size - use \l{QML:Qt::size()}{Qt.size()} +\li \c vector3d - use \l{QML:Qt::vector3d()}{Qt.vector3d()} \endlist There are also string based constructors for these types. See \l{qdeclarativebasictypes.html}{QML Basic Types} for more information. @@ -245,9 +245,9 @@ There are also string based constructors for these types. See \l{qdeclarativebas The Qt object contains several functions for formatting QDateTime, QDate and QTime values. \list - \o \l{QML:Qt::formatDateTime}{string Qt.formatDateTime(datetime date, variant format)} - \o \l{QML:Qt::formatDate}{string Qt.formatDate(datetime date, variant format)} - \o \l{QML:Qt::formatTime}{string Qt.formatTime(datetime date, variant format)} + \li \l{QML:Qt::formatDateTime}{string Qt.formatDateTime(datetime date, variant format)} + \li \l{QML:Qt::formatDate}{string Qt.formatDate(datetime date, variant format)} + \li \l{QML:Qt::formatTime}{string Qt.formatTime(datetime date, variant format)} \endlist The format specification is described at \l{QML:Qt::formatDateTime}{Qt.formatDateTime}. @@ -259,8 +259,8 @@ items from files or strings. See \l{Dynamic Object Management in QML} for an ove of their use. \list - \o \l{QML:Qt::createComponent()}{object Qt.createComponent(url)} - \o \l{QML:Qt::createQmlObject()}{object Qt.createQmlObject(string qml, object parent, string filepath)} + \li \l{QML:Qt::createComponent()}{object Qt.createComponent(url)} + \li \l{QML:Qt::createQmlObject()}{object Qt.createQmlObject(string qml, object parent, string filepath)} \endlist */ @@ -276,8 +276,8 @@ of their use. \table \row - \o \c application.active - \o + \li \c application.active + \li This read-only property indicates whether the application is the top-most and focused application, and the user is able to interact with the application. The property is false when the application is in the background, the device keylock or screen @@ -288,8 +288,8 @@ of their use. active. \row - \o \c application.layoutDirection - \o + \li \c application.layoutDirection + \li This read-only property can be used to query the default layout direction of the application. On system start-up, the default layout direction depends on the application's language. The property has a value of \c Qt.RightToLeft in locales @@ -300,9 +300,9 @@ of their use. Possible values are: \list - \o Qt.LeftToRight - Text and graphics elements should be positioned + \li Qt.LeftToRight - Text and graphics elements should be positioned from left to right. - \o Qt.RightToLeft - Text and graphics elements should be positioned + \li Qt.RightToLeft - Text and graphics elements should be positioned from right to left. \endlist \endtable @@ -327,11 +327,11 @@ Qt.include() returns an object that describes the status of the operation. The a single property, \c {status}, that is set to one of the following values: \table -\header \o Symbol \o Value \o Description -\row \o result.OK \o 0 \o The include completed successfully. -\row \o result.LOADING \o 1 \o Data is being loaded from the network. -\row \o result.NETWORK_ERROR \o 2 \o A network error occurred while fetching the url. -\row \o result.EXCEPTION \o 3 \o A JavaScript exception occurred while executing the included code. +\header \li Symbol \li Value \li Description +\row \li result.OK \li 0 \li The include completed successfully. +\row \li result.LOADING \li 1 \li Data is being loaded from the network. +\row \li result.NETWORK_ERROR \li 2 \li A network error occurred while fetching the url. +\row \li result.EXCEPTION \li 3 \li A JavaScript exception occurred while executing the included code. An additional \c exception property will be set in this case. \endtable @@ -1539,54 +1539,54 @@ If \a format is not provided, \a dateTime is formatted using \a format should be either. \list -\o One of the Qt::DateFormat enumeration values, such as +\li One of the Qt::DateFormat enumeration values, such as \c Qt.DefaultLocaleShortDate or \c Qt.ISODate -\o A string that specifies the format of the returned string, as detailed below. +\li A string that specifies the format of the returned string, as detailed below. \endlist If \a format specifies a format string, it should use the following expressions to specify the date: \table - \header \i Expression \i Output - \row \i d \i the day as number without a leading zero (1 to 31) - \row \i dd \i the day as number with a leading zero (01 to 31) - \row \i ddd - \i the abbreviated localized day name (e.g. 'Mon' to 'Sun'). + \header \li Expression \li Output + \row \li d \li the day as number without a leading zero (1 to 31) + \row \li dd \li the day as number with a leading zero (01 to 31) + \row \li ddd + \li the abbreviated localized day name (e.g. 'Mon' to 'Sun'). Uses QDate::shortDayName(). - \row \i dddd - \i the long localized day name (e.g. 'Monday' to 'Qt::Sunday'). + \row \li dddd + \li the long localized day name (e.g. 'Monday' to 'Qt::Sunday'). Uses QDate::longDayName(). - \row \i M \i the month as number without a leading zero (1-12) - \row \i MM \i the month as number with a leading zero (01-12) - \row \i MMM - \i the abbreviated localized month name (e.g. 'Jan' to 'Dec'). + \row \li M \li the month as number without a leading zero (1-12) + \row \li MM \li the month as number with a leading zero (01-12) + \row \li MMM + \li the abbreviated localized month name (e.g. 'Jan' to 'Dec'). Uses QDate::shortMonthName(). - \row \i MMMM - \i the long localized month name (e.g. 'January' to 'December'). + \row \li MMMM + \li the long localized month name (e.g. 'January' to 'December'). Uses QDate::longMonthName(). - \row \i yy \i the year as two digit number (00-99) - \row \i yyyy \i the year as four digit number + \row \li yy \li the year as two digit number (00-99) + \row \li yyyy \li the year as four digit number \endtable In addition the following expressions can be used to specify the time: \table - \header \i Expression \i Output - \row \i h - \i the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display) - \row \i hh - \i the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display) - \row \i m \i the minute without a leading zero (0 to 59) - \row \i mm \i the minute with a leading zero (00 to 59) - \row \i s \i the second without a leading zero (0 to 59) - \row \i ss \i the second with a leading zero (00 to 59) - \row \i z \i the milliseconds without leading zeroes (0 to 999) - \row \i zzz \i the milliseconds with leading zeroes (000 to 999) - \row \i AP - \i use AM/PM display. \e AP will be replaced by either "AM" or "PM". - \row \i ap - \i use am/pm display. \e ap will be replaced by either "am" or "pm". + \header \li Expression \li Output + \row \li h + \li the hour without a leading zero (0 to 23 or 1 to 12 if AM/PM display) + \row \li hh + \li the hour with a leading zero (00 to 23 or 01 to 12 if AM/PM display) + \row \li m \li the minute without a leading zero (0 to 59) + \row \li mm \li the minute with a leading zero (00 to 59) + \row \li s \li the second without a leading zero (0 to 59) + \row \li ss \li the second with a leading zero (00 to 59) + \row \li z \li the milliseconds without leading zeroes (0 to 999) + \row \li zzz \li the milliseconds with leading zeroes (000 to 999) + \row \li AP + \li use AM/PM display. \e AP will be replaced by either "AM" or "PM". + \row \li ap + \li use am/pm display. \e ap will be replaced by either "am" or "pm". \endtable All other input characters will be ignored. Any sequence of characters that @@ -1606,11 +1606,11 @@ This \a dateTime value could be passed to \c Qt.formatDateTime(), with the \a format values below to produce the following results: \table - \header \i Format \i Result - \row \i "dd.MM.yyyy" \i 21.05.2001 - \row \i "ddd MMMM d yy" \i Tue May 21 01 - \row \i "hh:mm:ss.zzz" \i 14:13:09.042 - \row \i "h:m:s ap" \i 2:13:9 pm + \header \li Format \li Result + \row \li "dd.MM.yyyy" \li 21.05.2001 + \row \li "ddd MMMM d yy" \li Tue May 21 01 + \row \li "hh:mm:ss.zzz" \li 14:13:09.042 + \row \li "h:m:s ap" \li 2:13:9 pm \endtable */ QScriptValue QDeclarativeEnginePrivate::formatDateTime(QScriptContext*ctxt, QScriptEngine*engine) diff --git a/src/declarative/qml/qdeclarativeextensionplugin.cpp b/src/declarative/qml/qdeclarativeextensionplugin.cpp index 48c08e13..16345881 100644 --- a/src/declarative/qml/qdeclarativeextensionplugin.cpp +++ b/src/declarative/qml/qdeclarativeextensionplugin.cpp @@ -57,10 +57,10 @@ QT_BEGIN_NAMESPACE To write a QML extension plugin: \list - \o Subclass QDeclarativeExtensionPlugin, implement registerTypes() method + \li Subclass QDeclarativeExtensionPlugin, implement registerTypes() method to register types using qmlRegisterType(), and export the class using the Q_EXPORT_PLUGIN2() macro - \o Write an appropriate project file for the plugin - \o Create a \l{Writing a qmldir file}{qmldir file} to describe the plugin + \li Write an appropriate project file for the plugin + \li Create a \l{Writing a qmldir file}{qmldir file} to describe the plugin \endlist QML extension plugins can be used to provide either application-specific or diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp index 17eae184..20f5fb6a 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.cpp +++ b/src/declarative/qml/qdeclarativeimageprovider.cpp @@ -58,12 +58,12 @@ public: in QML applications. It allows images in QML to be: \list - \o Loaded using QPixmaps rather than actual image files - \o Loaded asynchronously in a separate thread, if imageType() is \l{QDeclarativeImageProvider::ImageType}{ImageType::Image} + \li Loaded using QPixmaps rather than actual image files + \li Loaded asynchronously in a separate thread, if imageType() is \l{QDeclarativeImageProvider::ImageType}{ImageType::Image} \endlist To specify that an image should be loaded by an image provider, use the - \bold {"image:"} scheme for the URL source of the image, followed by the + \b {"image:"} scheme for the URL source of the image, followed by the identifiers of the image provider and the requested image. For example: \qml diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 58e05b0f..25e3b830 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -221,9 +221,9 @@ void QDeclarativeImports::populateCache(QDeclarativeTypeNameCache *cache, QDecla The given (namespace qualified) \a type is resolved to either \list - \o a QDeclarativeImportedNamespace stored at \a ns_return, - \o a QDeclarativeType stored at \a type_return, or - \o a component located at \a url_return. + \li a QDeclarativeImportedNamespace stored at \a ns_return, + \li a QDeclarativeType stored at \a type_return, or + \li a component located at \a url_return. \endlist If any return pointer is 0, the corresponding search is not done. @@ -866,13 +866,13 @@ QString QDeclarativeImportDatabase::resolvePlugin(const QDir &qmldirPath, const Returns the result of the merge of \a baseName with \a dir and the platform suffix. \table - \header \i Platform \i Valid suffixes - \row \i Windows \i \c .dll - \row \i Unix/Linux \i \c .so - \row \i AIX \i \c .a - \row \i HP-UX \i \c .sl, \c .so (HP-UXi) - \row \i Mac OS X \i \c .dylib, \c .bundle, \c .so - \row \i Symbian \i \c .dll + \header \li Platform \li Valid suffixes + \row \li Windows \li \c .dll + \row \li Unix/Linux \li \c .so + \row \li AIX \li \c .a + \row \li HP-UX \li \c .sl, \c .so (HP-UXi) + \row \li Mac OS X \li \c .dylib, \c .bundle, \c .so + \row \li Symbian \li \c .dll \endtable Version number on unix are ignored. diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp index 2668b997..ea761be4 100644 --- a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp +++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp @@ -65,12 +65,12 @@ QT_BEGIN_NAMESPACE be created in a different thread: \list - \o The QML engine internally handles all requests, and cleans up any + \li The QML engine internally handles all requests, and cleans up any QNetworkReply objects it creates. Receiving the QNetworkAccessManager::finished() signal in another thread may not provide the receiver with a valid reply object if it has already been deleted. - \o Authentication details provided to QNetworkAccessManager::authenticationRequired() + \li Authentication details provided to QNetworkAccessManager::authenticationRequired() must be provided immediately, so this signal cannot be connected as a Qt::QueuedConnection (or as the default Qt::AutoConnection from another thread). diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp index 7b450ecb..1c624224 100644 --- a/src/declarative/qml/qdeclarativetypeloader.cpp +++ b/src/declarative/qml/qdeclarativetypeloader.cpp @@ -102,14 +102,14 @@ The QDeclarativeDataLoader invokes callbacks on the QDeclarativeDataBlob as data This enum describes the status of the data blob. \list -\o Null The blob has not yet been loaded by a QDeclarativeDataLoader -\o Loading The blob is loading network data. The QDeclarativeDataBlob::setData() callback has not yet been +\li Null The blob has not yet been loaded by a QDeclarativeDataLoader +\li Loading The blob is loading network data. The QDeclarativeDataBlob::setData() callback has not yet been invoked or has not yet returned. -\o WaitingForDependencies The blob is waiting for dependencies to be done before continueing. This status +\li WaitingForDependencies The blob is waiting for dependencies to be done before continueing. This status only occurs after the QDeclarativeDataBlob::setData() callback has been made, and when the blob has outstanding dependencies. -\o Complete The blob's data has been loaded and all dependencies are done. -\o Error An error has been set on this blob. +\li Complete The blob's data has been loaded and all dependencies are done. +\li Error An error has been set on this blob. \endlist */ @@ -119,9 +119,9 @@ dependencies. This enum describes the type of the data blob. \list -\o QmlFile This is a QDeclarativeTypeData -\o JavaScriptFile This is a QDeclarativeScriptData -\o QmldirFile This is a QDeclarativeQmldirData +\li QmlFile This is a QDeclarativeTypeData +\li JavaScriptFile This is a QDeclarativeScriptData +\li QmldirFile This is a QDeclarativeQmldirData \endlist */ @@ -486,9 +486,9 @@ To complete processing, the QDeclarativeDataBlob::done() callback is invoked. d one of these three preconditions are met. \list 1 -\o The QDeclarativeDataBlob has no dependencies. -\o The QDeclarativeDataBlob has an error set. -\o All the QDeclarativeDataBlob's dependencies are themselves "done()". +\li The QDeclarativeDataBlob has no dependencies. +\li The QDeclarativeDataBlob has an error set. +\li All the QDeclarativeDataBlob's dependencies are themselves "done()". \endlist Thus QDeclarativeDataBlob::done() will always eventually be called, even if the blob has an error set. diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp index 30b0c99f..0cc47302 100644 --- a/src/declarative/qml/qdeclarativeworkerscript.cpp +++ b/src/declarative/qml/qdeclarativeworkerscript.cpp @@ -668,9 +668,9 @@ void QDeclarativeWorkerScript::setSource(const QUrl &source) types: \list - \o boolean, number, string - \o JavaScript objects and arrays - \o ListModel objects (any other type of QObject* is not allowed) + \li boolean, number, string + \li JavaScript objects and arrays + \li ListModel objects (any other type of QObject* is not allowed) \endlist All objects and arrays are copied to the \c message. With the exception 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 diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp index a16deb7f..6f5ddee6 100644 --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp @@ -104,15 +104,15 @@ public: \e{Elements in the Qt.labs module are not guaranteed to remain compatible in future versions.} - \bold{import Qt.labs.folderlistmodel 1.0} + \b{import Qt.labs.folderlistmodel 1.0} The \l folder property specifies the folder to access. Information about the files and directories in the folder is supplied via the model's interface. Components access names and paths via the following roles: \list - \o fileName - \o filePath + \li fileName + \li filePath \endlist Additionally a file entry can be differentiated from a folder entry via the @@ -303,11 +303,11 @@ void QDeclarativeFolderListModel::componentComplete() The \a sortField property contains field to use for sorting. sortField may be one of: \list - \o Unsorted - no sorting is applied. The order is system default. - \o Name - sort by filename - \o Time - sort by time modified - \o Size - sort by file size - \o Type - sort by file type (extension) + \li Unsorted - no sorting is applied. The order is system default. + \li Name - sort by filename + \li Time - sort by time modified + \li Size - sort by file size + \li Type - sort by file type (extension) \endlist \sa sortReversed diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp index afddba62..46d6db2e 100644 --- a/src/imports/gestures/qdeclarativegesturearea.cpp +++ b/src/imports/gestures/qdeclarativegesturearea.cpp @@ -113,23 +113,23 @@ public: properties of the gesture. \table - \header \o Signal \o Type \o Property \o Description - \row \o onTap \o point \o position \o the position of the tap - \row \o onTapAndHold \o point \o position \o the position of the tap - \row \o onPan \o real \o acceleration \o the acceleration of the pan - \row \o onPan \o point \o delta \o the offset from the previous input position to the current input - \row \o onPan \o point \o offset \o the total offset from the first input position to the current input position - \row \o onPan \o point \o lastOffset \o the previous value of offset - \row \o onPinch \o point \o centerPoint \o the midpoint between the two input points - \row \o onPinch \o point \o lastCenterPoint \o the previous value of centerPoint - \row \o onPinch \o point \o startCenterPoint \o the first value of centerPoint - \row \o onPinch \o real \o rotationAngle \o the angle covered by the gesture motion - \row \o onPinch \o real \o lastRotationAngle \o the previous value of rotationAngle - \row \o onPinch \o real \o totalRotationAngle \o the complete angle covered by the gesture - \row \o onPinch \o real \o scaleFactor \o the change in distance between the two input points - \row \o onPinch \o real \o lastScaleFactor \o the previous value of scaleFactor - \row \o onPinch \o real \o totalScaleFactor \o the complete scale factor of the gesture - \row \o onSwipe \o real \o swipeAngle \o the angle of the swipe + \header \li Signal \li Type \li Property \li Description + \row \li onTap \li point \li position \li the position of the tap + \row \li onTapAndHold \li point \li position \li the position of the tap + \row \li onPan \li real \li acceleration \li the acceleration of the pan + \row \li onPan \li point \li delta \li the offset from the previous input position to the current input + \row \li onPan \li point \li offset \li the total offset from the first input position to the current input position + \row \li onPan \li point \li lastOffset \li the previous value of offset + \row \li onPinch \li point \li centerPoint \li the midpoint between the two input points + \row \li onPinch \li point \li lastCenterPoint \li the previous value of centerPoint + \row \li onPinch \li point \li startCenterPoint \li the first value of centerPoint + \row \li onPinch \li real \li rotationAngle \li the angle covered by the gesture motion + \row \li onPinch \li real \li lastRotationAngle \li the previous value of rotationAngle + \row \li onPinch \li real \li totalRotationAngle \li the complete angle covered by the gesture + \row \li onPinch \li real \li scaleFactor \li the change in distance between the two input points + \row \li onPinch \li real \li lastScaleFactor \li the previous value of scaleFactor + \row \li onPinch \li real \li totalScaleFactor \li the complete scale factor of the gesture + \row \li onSwipe \li real \li swipeAngle \li the angle of the swipe \endtable Custom gestures, handled by onGesture, will have custom properties. diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp index f66a9723..87b97d38 100644 --- a/src/imports/particles/qdeclarativeparticles.cpp +++ b/src/imports/particles/qdeclarativeparticles.cpp @@ -616,7 +616,7 @@ void QDeclarativeParticlesPrivate::updateOpacity(QDeclarativeParticle &p, int ag \brief The Particles object generates and moves particles. \inherits Item - Particles are available in the \bold{Qt.labs.particles 1.0} module. + Particles are available in the \b{Qt.labs.particles 1.0} module. \e {Elements in the Qt.labs module are not guaranteed to remain compatible in future versions.} diff --git a/src/imports/shaders/shadereffectitem.cpp b/src/imports/shaders/shadereffectitem.cpp index ac5a985e..9c25aa78 100644 --- a/src/imports/shaders/shadereffectitem.cpp +++ b/src/imports/shaders/shadereffectitem.cpp @@ -76,7 +76,7 @@ static const char qt_emptyAttributeName[] = ""; \brief The ShaderEffectItem object alters the output of given item with OpenGL shaders. \inherits Item - ShaderEffectItem is available in the \bold{Qt.labs.shaders 1.0} module. + ShaderEffectItem is available in the \b{Qt.labs.shaders 1.0} module. \e {Elements in the Qt.labs module are not guaranteed to remain compatible in future versions.} @@ -99,15 +99,15 @@ static const char qt_emptyAttributeName[] = ""; A standard set of vertex attributes are provided for the shaders: \list - \o qt_Vertex - The primary position of the vertex. - \o qt_MultiTexCoord0 - The texture co-ordinate at each vertex for texture unit 0. + \li qt_Vertex - The primary position of the vertex. + \li qt_MultiTexCoord0 - The texture co-ordinate at each vertex for texture unit 0. \endlist Additionally following uniforms are available for shaders: \list - \o qt_Opacity - Effective opacity of the item. - \o qt_ModelViewProjectionMatrix - current 4x4 transformation matrix of the item. + \li qt_Opacity - Effective opacity of the item. + \li qt_ModelViewProjectionMatrix - current 4x4 transformation matrix of the item. \endlist Furthermore, it is possible to utilize automatic QML propertybinding into vertex- and fragment shader @@ -115,38 +115,38 @@ static const char qt_emptyAttributeName[] = ""; \table \header - \o QML property - \o GLSL uniform + \li QML property + \li GLSL uniform \row - \o property double foo: 1.0 - \o uniform highp float foo + \li property double foo: 1.0 + \li uniform highp float foo \row - \o property real foo: 1.0 - \o uniform highp float foo + \li property real foo: 1.0 + \li uniform highp float foo \row - \o property bool foo: true - \o uniform bool foo + \li property bool foo: true + \li uniform bool foo \row - \o property int foo: 1 - \o uniform int foo + \li property int foo: 1 + \li uniform int foo \row - \o property variant foo: Qt.point(1,1) - \o uniform highp vec2 foo + \li property variant foo: Qt.point(1,1) + \li uniform highp vec2 foo \row - \o property variant foo: Qt.size(1, 1) - \o uniform highp vec2 foo + \li property variant foo: Qt.size(1, 1) + \li uniform highp vec2 foo \row - \o property variant foo: Qt.rect(1, 1, 2, 2) - \o uniform highp vec4 foo + \li property variant foo: Qt.rect(1, 1, 2, 2) + \li uniform highp vec4 foo \row - \o property color foo: "#00000000" - \o uniform lowp vec4 foo + \li property color foo: "#00000000" + \li uniform lowp vec4 foo \row - \o property variant foo: Qt.vector3d(1.0, 2.0, 0.0) - \o uniform highp vec3 foo + \li property variant foo: Qt.vector3d(1.0, 2.0, 0.0) + \li uniform highp vec3 foo \row - \o property variant foo: ShaderEffectSource { SourceItem: bar } - \o uniform lowp sampler2D foo + \li property variant foo: ShaderEffectSource { SourceItem: bar } + \li uniform lowp sampler2D foo \endtable \note The uniform precision definitions in the above table are not strict, it is possible to choose the uniform diff --git a/src/imports/shaders/shadereffectsource.cpp b/src/imports/shaders/shadereffectsource.cpp index fb333183..57e0f43b 100644 --- a/src/imports/shaders/shadereffectsource.cpp +++ b/src/imports/shaders/shadereffectsource.cpp @@ -51,7 +51,7 @@ \ingroup qml-shader-elements \brief The ShaderEffectSource object encapsulates the source content for the ShaderEffectItem. - ShaderEffectSource is available in the \bold{Qt.labs.shaders 1.0} module. + ShaderEffectSource is available in the \b{Qt.labs.shaders 1.0} module. \e {Elements in the Qt.labs module are not guaranteed to remain compatible in future versions.} @@ -241,10 +241,10 @@ void ShaderEffectSource::setHideSource(bool hide) This property defines the wrap parameter for the source after it has been mapped as a texture. \list - \o ShaderEffectSource.ClampToEdge - Causes texturecoordinates to be clamped to the range [ 1/2*N , 1 - 1/2*N ], where N is the texture width. - \o ShaderEffectSource.RepeatHorizontally - Causes the integer part of the horizontal texturecoordinate to be ignored; the GL uses only the fractional part, thereby creating a horizontal repeating pattern. - \o ShaderEffectSource.RepeatVertically - Causes the integer part of the vertical texturecoordinate to be ignored; the GL uses only the fractional part, thereby creating a vertical repeating pattern. - \o ShaderEffectSource.Repeat - Causes the integer part of both the horizontal and vertical texturecoordinates to be ignored; the GL uses only the fractional part, thereby creating a repeating pattern. + \li ShaderEffectSource.ClampToEdge - Causes texturecoordinates to be clamped to the range [ 1/2*N , 1 - 1/2*N ], where N is the texture width. + \li ShaderEffectSource.RepeatHorizontally - Causes the integer part of the horizontal texturecoordinate to be ignored; the GL uses only the fractional part, thereby creating a horizontal repeating pattern. + \li ShaderEffectSource.RepeatVertically - Causes the integer part of the vertical texturecoordinate to be ignored; the GL uses only the fractional part, thereby creating a vertical repeating pattern. + \li ShaderEffectSource.Repeat - Causes the integer part of both the horizontal and vertical texturecoordinates to be ignored; the GL uses only the fractional part, thereby creating a repeating pattern. \endlist The default value is ClampToEdge. |