diff options
Diffstat (limited to 'src/quick/items')
22 files changed, 88 insertions, 80 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 16f08d3a3a..b7de41cae8 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -415,7 +415,7 @@ void QQuickCanvasItem::setCanvasSize(const QSizeF & size) By default the tileSize is the same as the canvasSize. - \sa QtQuick2::Canvas::canvaasSize, QtQuick2::Canvas::canvasWindow + \sa QtQuick2::Canvas::canvasSize, QtQuick2::Canvas::canvasWindow */ QSize QQuickCanvasItem::tileSize() const { @@ -873,8 +873,8 @@ QQmlRefPointer<QQuickCanvasPixmap> QQuickCanvasItem::loadedPixmap(const QUrl& ur The loaded image can be unloaded by the \a QtQuick2::Canvas::unloadImage method. Note: Only loaded images can be painted on the Canvas item. - \sa QtQuick2::Canvas::unloadImage, QtQuick2::Canvas::imageLoaded, QtQuick2::Canvas::isImageLoaded, - QtQuick2::Context2D::createImageData, QtQuick2::Context2D::drawImage + \sa QtQuick2::Canvas::unloadImage, QtQuick2::Canvas::onImageLoaded, QtQuick2::Canvas::isImageLoaded, + QtQuick2::Context2D::createImageData(), QtQuick2::Context2D::drawImage */ void QQuickCanvasItem::loadImage(const QUrl& url) { @@ -900,8 +900,8 @@ void QQuickCanvasItem::loadImage(const QUrl& url) Once an image is unloaded it cannot be painted by the canvas context unless it is loaded again. - \sa QtQuick2::Canvas::loadImage, QtQuick2::Canvas::imageLoaded, QtQuick2::Canvas::isImageLoaded, - QtQuick2::Context2D::createImageData, QtQuick2::Context2D::drawImage + \sa QtQuick2::Canvas::loadImage, QtQuick2::Canvas::onImageLoaded, QtQuick2::Canvas::isImageLoaded, + QtQuick2::Context2D::createImageData(), QtQuick2::Context2D::drawImage */ void QQuickCanvasItem::unloadImage(const QUrl& url) { diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index d940a0ba58..3b75229f7a 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -818,7 +818,7 @@ static void ctx2d_globalCompositeOperation_set(v8::Local<v8::String>, v8::Local< The default value is '#000000'. \sa QtQuick2::Context2D::createLinearGradient \sa QtQuick2::Context2D::createRadialGradient - \sa QtQuick2::Context2D::createPattern + \sa QtQuick2::Context2D::createPattern() \sa QtQuick2::Context2D::strokeStyle */ static v8::Handle<v8::Value> ctx2d_fillStyle(v8::Local<v8::String>, const v8::AccessorInfo &info) @@ -923,7 +923,7 @@ static void ctx2d_fillRule_set(v8::Local<v8::String>, v8::Local<v8::Value> value \sa QtQuick2::Context2D::createLinearGradient \sa QtQuick2::Context2D::createRadialGradient - \sa QtQuick2::Context2D::createPattern + \sa QtQuick2::Context2D::createPattern() \sa QtQuick2::Context2D::fillStyle */ v8::Handle<v8::Value> ctx2d_strokeStyle(v8::Local<v8::String>, const v8::AccessorInfo &info) @@ -992,8 +992,8 @@ static void ctx2d_strokeStyle_set(v8::Local<v8::String>, v8::Local<v8::Value> va \sa QtQuick2::Context2D::CanvasGradient::addColorStop \sa QtQuick2::Context2D::createRadialGradient - \sa QtQuick2::Context2D::ctx2d_createConicalGradient - \sa QtQuick2::Context2D::createPattern + \sa QtQuick2::Context2D::ctx2d_createConicalGradient() + \sa QtQuick2::Context2D::createPattern() \sa QtQuick2::Context2D::fillStyle \sa QtQuick2::Context2D::strokeStyle */ @@ -1038,8 +1038,8 @@ static v8::Handle<v8::Value> ctx2d_createLinearGradient(const v8::Arguments &arg \sa QtQuick2::Context2D::CanvasGradient::addColorStop \sa QtQuick2::Context2D::createLinearGradient - \sa QtQuick2::Context2D::ctx2d_createConicalGradient - \sa QtQuick2::Context2D::createPattern + \sa QtQuick2::Context2D::ctx2d_createConicalGradient() + \sa QtQuick2::Context2D::createPattern() \sa QtQuick2::Context2D::fillStyle \sa QtQuick2::Context2D::strokeStyle */ @@ -1093,8 +1093,8 @@ static v8::Handle<v8::Value> ctx2d_createRadialGradient(const v8::Arguments &arg \sa QtQuick2::Context2D::CanvasGradient::addColorStop \sa QtQuick2::Context2D::createLinearGradient - \sa QtQuick2::Context2D::ctx2d_createRadialGradient - \sa QtQuick2::Context2D::createPattern + \sa QtQuick2::Context2D::ctx2d_createRadialGradient() + \sa QtQuick2::Context2D::createPattern() \sa QtQuick2::Context2D::fillStyle \sa QtQuick2::Context2D::strokeStyle */ @@ -2256,7 +2256,7 @@ static v8::Handle<v8::Value> ctx2d_measureText(const v8::Arguments &args) \sa QtQuick2::Image \sa QtQuick2::Canvas::loadImage \sa QtQuick2::Canvas::isImageLoaded - \sa QtQuick2::Canvas::imageLoaded + \sa QtQuick2::Canvas::onImageLoaded \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-drawimage}{W3C 2d context standard for drawImage} */ @@ -2276,7 +2276,7 @@ static v8::Handle<v8::Value> ctx2d_measureText(const v8::Arguments &args) \sa QtQuick2::Image \sa QtQuick2::Canvas::loadImage \sa QtQuick2::Canvas::isImageLoaded - \sa QtQuick2::Canvas::imageLoaded + \sa QtQuick2::Canvas::onImageLoaded \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-drawimage}{W3C 2d context standard for drawImage} */ @@ -2297,7 +2297,7 @@ static v8::Handle<v8::Value> ctx2d_measureText(const v8::Arguments &args) \sa QtQuick2::Image \sa QtQuick2::Canvas::loadImage \sa QtQuick2::Canvas::isImageLoaded - \sa QtQuick2::Canvas::imageLoaded + \sa QtQuick2::Canvas::onImageLoaded \sa {http://www.w3.org/TR/2dcontext/#dom-context-2d-drawimage}{W3C 2d context standard for drawImage} */ @@ -2419,7 +2419,7 @@ static v8::Handle<v8::Value> ctx2d_drawImage(const v8::Arguments &args) \sa QtQuick2::CanvasImageData::width \sa QtQuick2::CanvasImageData::height \sa QtQuick2::CanvasImageData::data - \sa QtQuick2::Context2D::createImageData + \sa QtQuick2::Context2D::createImageData() \sa QtQuick2::Context2D::getImageData \sa QtQuick2::Context2D::putImageData */ diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp index f7a8793a99..ab27993405 100644 --- a/src/quick/items/qquickdroparea.cpp +++ b/src/quick/items/qquickdroparea.cpp @@ -100,13 +100,13 @@ QQuickDropAreaPrivate::~QQuickDropAreaPrivate() A DropArea is an invisible item which receives events when other items are dragged over it. - The Drag attached property can be used to notify the DropArea when an Item is + The \l Drag attached property can be used to notify the DropArea when an Item is dragged over it. The \l keys property can be used to filter drag events which don't include a matching key. - The \l dropItem property is communicated to the source of a drag event as + The \l source property is communicated to the source of a drag event as the recipient of a drop on the drag target. The \l delegate property provides a means to specify a component to be diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp index b4e3a385f4..0a472ea163 100644 --- a/src/quick/items/qquickflipable.cpp +++ b/src/quick/items/qquickflipable.cpp @@ -124,8 +124,8 @@ public: default states, the NumberAnimation animates the angle between its old and new values. - See \l {States} for details on state changes and the default - state, and \l {QML Animation and Transitions} for more information on how + See \l {Qt Quick States} for details on state changes and the default + state, and \l {Animation and Transitions in Qt Quick} for more information on how animations work within transitions. \sa {declarative/ui-components/flipable}{Flipable example} diff --git a/src/quick/items/qquickfocusscope.cpp b/src/quick/items/qquickfocusscope.cpp index 871a2cf193..9790b39702 100644 --- a/src/quick/items/qquickfocusscope.cpp +++ b/src/quick/items/qquickfocusscope.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE Focus scopes assist in keyboard focus handling when building reusable QML components. All the details are covered in the - \l {qmlfocus}{keyboard focus documentation}. + \l {Keyboard Focus in Qt Quick}{keyboard focus documentation}. \sa {declarative/keyinteraction/focus}{Keyboard focus example} */ diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp index b5623800fd..139f9e79f1 100644 --- a/src/quick/items/qquickgridview.cpp +++ b/src/quick/items/qquickgridview.cpp @@ -1186,7 +1186,7 @@ bool QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte The currently selected item is highlighted with a blue \l Rectangle using the \l highlight property, and \c focus is set to \c true to enable keyboard navigation for the grid view. - The grid view itself is a focus scope (see \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} for more details). + The grid view itself is a focus scope (see \l{Keyboard Focus in Qt Quick} for more details). Delegates are instantiated as needed and may be destroyed at any time. State should \e never be stored in a delegate. @@ -1335,7 +1335,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) or \l VisualItemModel, or provided by C++ model classes. If a C++ model class is used, it must be a subclass of \l QAbstractItemModel or a simple list. - \sa {qmlmodels}{Data Models} + \sa {qml-data-models}{Data Models} */ /*! @@ -1343,7 +1343,7 @@ void QQuickGridView::setHighlightFollowsCurrentItem(bool autoHighlight) The delegate provides a template defining each item instantiated by the view. The index is exposed as an accessible \c index property. Properties of the - model are also available depending upon the type of \l {qmlmodels}{Data Model}. + model are also available depending upon the type of \l {qml-data-models}{Data Model}. The number of objects and bindings in the delegate has a direct effect on the flicking performance of the view. If at all possible, place functionality @@ -1716,7 +1716,7 @@ void QQuickGridView::setSnapMode(SnapMode mode) \list \li The view is first created \li The view's \l model changes - \li The view's \l model is \l {QAbstractItemModel::reset}{reset}, if the model is a QAbstractItemModel subclass + \li The view's \l model is \l {QAbstractItemModel::reset()}{reset}, if the model is a QAbstractItemModel subclass \endlist For example, here is a view that specifies such a transition: diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index 9d2babbccf..8b0392f403 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -403,7 +403,7 @@ qreal QQuickImage::paintedHeight() const If both the sourceSize.width and sourceSize.height are set the image will be scaled down to fit within the specified size, maintaining the image's aspect ratio. The actual - size of the image after scaling is available via \l implicitWidth and \l implicitHeight. + size of the image after scaling is available via \l Item::implicitWidth and \l Item::implicitHeight. If the source is an intrinsically scalable image (eg. SVG), this property determines the size of the loaded image regardless of intrinsic size. diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index f360ca5270..af470533dd 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -1478,7 +1478,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj) \brief Property used to mirror layout behavior The LayoutMirroring attached property is used to horizontally mirror \l {anchor-layout}{Item anchors}, - \l{Using QML Positioner and Repeater Items}{positioner} types (such as \l Row and \l Grid) + \l{Item Layouts}{positioner} types (such as \l Row and \l Grid) and views (such as \l GridView and horizontal \l ListView). Mirroring is a visual change: left anchors become right anchors, and positioner types like \l Grid and \l Row reverse the horizontal layout of child items. @@ -1509,7 +1509,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj) mirroring is not the desired behavior, or if the child item already implements mirroring in some custom way. - See \l {QML Right-to-left User Interfaces} for further details on using \c LayoutMirroring and + See \l {Right-to-left User Interfaces} for further details on using \c LayoutMirroring and other related features to implement right-to-left support for an application. */ @@ -1518,7 +1518,7 @@ QQuickKeysAttached *QQuickKeysAttached::qmlAttachedProperties(QObject *obj) This property holds whether the item's layout is mirrored horizontally. Setting this to true horizontally reverses \l {anchor-layout}{anchor} settings such that left anchors become right, - and right anchors become left. For \l{Using QML Positioner and Repeater Items}{positioner} types + and right anchors become left. For \l{Item Layouts}{positioner} types (such as \l Row and \l Grid) and view types (such as \l {GridView}{GridView} and \l {ListView}{ListView}) this also mirrors the horizontal layout direction of the item. @@ -1771,7 +1771,7 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus) as \l {Keys::onPressed}{onPressed} and \l {Keys::onReleased}{onReleased}, as well as handlers for specific keys, such as \l {Keys::onCancelPressed}{onCancelPressed}. The example below - assigns \l {qmlfocus}{focus} to the item and handles + assigns \l {Keyboard Focus in Qt Quick}{focus} to the item and handles the Left key via the general \e onPressed handler and the Select key via the onSelectPressed handler: @@ -5484,7 +5484,7 @@ QRectF QQuickItem::mapRectFromScene(const QRectF &rect) const } \endqml - \sa {qmlstate}{States} + \sa {Qt Quick States}{Qt Quick States} */ /*! \qmlproperty list<Transition> QtQuick2::Item::transitions @@ -5504,7 +5504,7 @@ QRectF QQuickItem::mapRectFromScene(const QRectF &rect) const } \endqml - \sa {QML Animation and Transitions}{Transitions} + \sa {Animation and Transitions in Qt Quick}{Transitions} */ /* \qmlproperty list<Filter> QtQuick2::Item::filter @@ -5574,7 +5574,7 @@ QRectF QQuickItem::mapRectFromScene(const QRectF &rect) const set), \c state will be a blank string. Likewise, you can return an item to its base state by setting its current state to \c ''. - \sa {qmlstates}{States} + \sa {Qt Quick States}{Qt Quick States} */ /*! @@ -5623,7 +5623,7 @@ QRectF QQuickItem::mapRectFromScene(const QRectF &rect) const } \endqml - \sa focus, {qmlfocus}{Keyboard Focus} + \sa focus, {Keyboard Focus in Qt Quick}{Keyboard Focus} */ /*! @@ -5655,7 +5655,7 @@ QRectF QQuickItem::mapRectFromScene(const QRectF &rect) const } \endqml - \sa activeFocus, {qmlfocus}{Keyboard Focus} + \sa activeFocus, {Keyboard Focus in Qt Quick}{Keyboard Focus} */ @@ -6045,9 +6045,9 @@ void QQuickItemLayer::deactivateEffect() Holds the effect that is applied to this layer. The effect is typically a \l ShaderEffect component, although any \l Item component can be - assigned. The effect should have a source texture property with a name matching \l samplerName. + assigned. The effect should have a source texture property with a name matching \l layer.samplerName. - \sa samplerName + \sa layer.samplerName */ void QQuickItemLayer::setEffect(QQmlComponent *component) @@ -6135,10 +6135,10 @@ void QQuickItemLayer::setFormat(QQuickShaderEffectSource::Format f) /*! \qmlproperty enumeration QtQuick2::Item::layer.sourceRect - This property defines which rectangular area of the \l sourceItem to - render into the texture. The source rectangle can be larger than - \l sourceItem itself. If the rectangle is null, which is the default, - the whole \l sourceItem is rendered to texture. + This property defines the rectangular area of the item that should be + rendered into the texture. The source rectangle can be larger than + the item itself. If the rectangle is null, which is the default, + then the whole item is rendered to the texture. */ void QQuickItemLayer::setSourceRect(const QRectF &sourceRect) @@ -6235,10 +6235,10 @@ void QQuickItemLayer::setWrapMode(QQuickShaderEffectSource::WrapMode mode) Holds the name of the effect's source texture property. - samplerName needs to match the name of the effect's source texture property + This value must match the name of the effect's source texture property so that the Item can pass the layer's offscreen surface to the effect correctly. - \sa effect, ShaderEffect + \sa layer.effect, ShaderEffect */ void QQuickItemLayer::setName(const QByteArray &name) { diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp index 078fb3f37a..aecf45b2fc 100644 --- a/src/quick/items/qquickitemanimation.cpp +++ b/src/quick/items/qquickitemanimation.cpp @@ -88,10 +88,10 @@ QT_BEGIN_NAMESPACE Like any other animation type, a ParentAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l {QML Animation and Transitions} documentation shows a + sources. The \l {Animation and Transitions in Qt Quick} documentation shows a variety of methods for creating animations. - \sa {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example} + \sa {Animation and Transitions in Qt Quick}, {declarative/animation/basics}{Animation basics example} */ QQuickParentAnimation::QQuickParentAnimation(QObject *parent) : QQuickAnimationGroup(*(new QQuickParentAnimationPrivate), parent) @@ -436,10 +436,10 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act Like any other animation type, an AnchorAnimation can be applied in a number of ways, including transitions, behaviors and property value - sources. The \l {QML Animation and Transitions} documentation shows a + sources. The \l {Animation and Transitions in Qt Quick} documentation shows a variety of methods for creating animations. - \sa {QML Animation and Transitions}, AnchorChanges + \sa {Animation and Transitions in Qt Quick}, AnchorChanges */ QQuickAnchorAnimation::QQuickAnchorAnimation(QObject *parent) : QQuickAbstractAnimation(*(new QQuickAnchorAnimationPrivate), parent) @@ -583,7 +583,7 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QQuickStateActions &act In the above case, the path start will be the item's current position, and the path end will be the item's target position in the target state. - \sa {QML Animation and Transitions}, PathInterpolator + \sa {Animation and Transitions in Qt Quick}, PathInterpolator */ QQuickPathAnimation::QQuickPathAnimation(QObject *parent) : QQuickAbstractAnimation(*(new QQuickPathAnimationPrivate), parent) diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp index 818f045188..f9ff4db153 100644 --- a/src/quick/items/qquicklistview.cpp +++ b/src/quick/items/qquicklistview.cpp @@ -1691,13 +1691,13 @@ bool QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte The currently selected item is highlighted with a blue \l Rectangle using the \l highlight property, and \c focus is set to \c true to enable keyboard navigation for the list view. - The list view itself is a focus scope (see \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} for more details). + The list view itself is a focus scope (see \l{Keyboard Focus in Qt Quick} for more details). Delegates are instantiated as needed and may be destroyed at any time. State should \e never be stored in a delegate. ListView attaches a number of properties to the root item of the delegate, for example - \c {ListView.isCurrentItem}. In the following example, the root delegate item can access + \c {ListView:isCurrentItem}. In the following example, the root delegate item can access this attached property directly as \c ListView.isCurrentItem, while the child \c contactInfo object must refer to this property as \c wrapper.ListView.isCurrentItem. @@ -1844,7 +1844,7 @@ QQuickListView::~QQuickListView() or \l VisualItemModel, or provided by C++ model classes. If a C++ model class is used, it must be a subclass of \l QAbstractItemModel or a simple list. - \sa {qmlmodels}{Data Models} + \sa {qml-data-models}{Data Models} */ /*! @@ -1852,7 +1852,7 @@ QQuickListView::~QQuickListView() The delegate provides a template defining each item instantiated by the view. The index is exposed as an accessible \c index property. Properties of the - model are also available depending upon the type of \l {qmlmodels}{Data Model}. + model are also available depending upon the type of \l {qml-data-models}{Data Model}. The number of objects and bindings in the delegate has a direct effect on the flicking performance of the view. If at all possible, place functionality @@ -2350,7 +2350,7 @@ void QQuickListView::setSnapMode(SnapMode mode) An instance of the header component is created for each view. The header is positioned at the beginning of the view, before any items. - \sa footer, headertem + \sa footer, headerItem */ /*! @@ -2384,7 +2384,7 @@ void QQuickListView::setSnapMode(SnapMode mode) \list \li The view is first created \li The view's \l model changes - \li The view's \l model is \l {QAbstractItemModel::reset}{reset}, if the model is a QAbstractItemModel subclass + \li The view's \l model is \l {QAbstractItemModel::reset()}{reset}, if the model is a QAbstractItemModel subclass \endlist For example, here is a view that specifies such a transition: diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index 52338af07a..591987866b 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -244,7 +244,7 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const Loader is a focus scope. Its \l {Item::}{focus} property must be set to \c true for any of its children to get the \e {active focus}. (See - \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} + \l{Keyboard Focus in Qt Quick} for more details.) Any key events received in the loaded item should likely also be \l {KeyEvent::}{accepted} so they are not propagated to the Loader. @@ -314,7 +314,7 @@ QQuickLoader::~QQuickLoader() /*! \qmlproperty bool QtQuick2::Loader::active This property is \c true if the Loader is currently active. - The default value for the \l active property is \c true. + The default value for this property is \c true. If the Loader is inactive, changing the \l source or \l sourceComponent will not cause the item to be instantiated until the Loader is made active. diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index f6f48e493f..1c954b3d6c 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -233,7 +233,7 @@ void QQuickTouchPoint::setSceneY(qreal sceneY) A MultiPointTouchArea is an invisible item that is used to track multiple touch points. - The \l enabled property is used to enable and disable touch handling. When disabled, + The \l Item::enabled property is used to enable and disable touch handling. When disabled, the touch area becomes transparent to mouse/touch events. MultiPointTouchArea can be used in two ways: diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index 00443fb013..748166a2b2 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -497,7 +497,7 @@ void QQuickPathViewPrivate::setDragging(bool d) } \endqml - The path view itself is a focus scope (see \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} for more details). + The path view itself is a focus scope (see \l{Keyboard Focus in Qt Quick} for more details). Delegates are instantiated as needed and may be destroyed at any time. State should \e never be stored in a delegate. @@ -582,7 +582,7 @@ QQuickPathView::~QQuickPathView() \note changing the model will reset the offset and currentIndex to 0. - \sa {qmlmodels}{Data Models} + \sa {qml-data-models}{Data Models} */ QVariant QQuickPathView::model() const { @@ -1167,7 +1167,7 @@ bool QQuickPathView::isDragging() const The delegate provides a template defining each item instantiated by the view. The index is exposed as an accessible \c index property. Properties of the - model are also available depending upon the type of \l {qmlmodels}{Data Model}. + model are also available depending upon the type of \l {qml-data-models}{Data Model}. The number of objects and bindings in the delegate has a direct effect on the flicking performance of the view when pathItemCount is specified. If at all possible, place functionality diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp index 333cd8f3ff..5e2f2e884f 100644 --- a/src/quick/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.cpp @@ -504,8 +504,8 @@ void QQuickBasePositioner::updateAttachedProperties(QQuickPositionerAttached *sp where it exists within the layout of its parent Column, Row, Flow or Grid. For example, below is a \l Grid with 16 child rectangles, as created through a \l Repeater. - Each \l Rectangle displays its index in the Grid using \l Positioner.index, and the first - item is colored differently by taking \l Positioner.isFirstItem into account: + Each \l Rectangle displays its index in the Grid using \l {Positioner::index}{Positioner.index}, and the first + item is colored differently by taking \l {Positioner::isFirstItem}{Positioner.isFirstItem} into account: \code Grid { @@ -585,7 +585,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) Column is a type that positions its child items along a single column. It can be used as a convenient way to vertically position a series of items without - using \l {Anchor-based Layout in QML}{anchors}. + using \l {Positioning with Anchors}{anchors}. Below is a Column that contains three rectangles of various sizes: @@ -650,7 +650,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) \list \li Items that are created or reparented as a child of the positioner after the positioner has been created - \li Child items that change their \l visible property from false to true, and thus + \li Child items that change their \l Item::visible property from false to true, and thus are now visible \endlist @@ -754,7 +754,7 @@ void QQuickColumn::reportConflictingAnchors() Row is a type that positions its child items along a single row. It can be used as a convenient way to horizontally position a series of items without - using \l {Anchor-based Layout in QML}{anchors}. + using \l {Positioning with Anchors}{anchors}. Below is a Row that contains three rectangles of various sizes: @@ -804,7 +804,7 @@ void QQuickColumn::reportConflictingAnchors() \list \li Items that are created or reparented as a child of the positioner after the positioner has been created - \li Child items that change their \l visible property from false to true, and thus + \li Child items that change their \l Item::visible property from false to true, and thus are now visible \endlist @@ -1037,7 +1037,7 @@ void QQuickRow::reportConflictingAnchors() \list \li Items that are created or reparented as a child of the positioner after the positioner has been created - \li Child items that change their \l visible property from false to true, and thus + \li Child items that change their \l Item::visible property from false to true, and thus are now visible \endlist @@ -1471,7 +1471,7 @@ void QQuickGrid::reportConflictingAnchors() \list \li Items that are created or reparented as a child of the positioner after the positioner has been created - \li Child items that change their \l visible property from false to true, and thus + \li Child items that change their \l Item::visible property from false to true, and thus are now visible \endlist diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp index 542f544eef..0e9a416101 100644 --- a/src/quick/items/qquickrectangle.cpp +++ b/src/quick/items/qquickrectangle.cpp @@ -286,7 +286,7 @@ int QQuickRectanglePrivate::doUpdateSlotIdx = -1; You can also create rounded rectangles using the \l radius property. Since this introduces curved edges to the corners of a rectangle, it may be appropriate to - set the \l antialiasing property to improve its appearance. + set the \l Item::antialiasing property to improve its appearance. \section1 Example Usage diff --git a/src/quick/items/qquickrepeater.cpp b/src/quick/items/qquickrepeater.cpp index 943375d0fa..beb7be8edc 100644 --- a/src/quick/items/qquickrepeater.cpp +++ b/src/quick/items/qquickrepeater.cpp @@ -85,7 +85,7 @@ QQuickRepeaterPrivate::~QQuickRepeaterPrivate() \image repeater-simple.png - A Repeater's \l model can be any of the supported \l {qmlmodels}{data models}. + A Repeater's \l model can be any of the supported \l {qml-data-models}{data models}. Additionally, like delegates for other views, a Repeater delegate can access its index within the repeater, as well as the model data relevant to the delegate. See the \l delegate property documentation for details. @@ -159,7 +159,7 @@ QQuickRepeater::~QQuickRepeater() The model providing data for the repeater. - This property can be set to any of the supported \l {qmlmodels}{data models}: + This property can be set to any of the supported \l {qml-data-models}{data models}: \list \li A number that indicates the number of delegates to be created by the repeater @@ -170,7 +170,7 @@ QQuickRepeater::~QQuickRepeater() The type of model affects the properties that are exposed to the \l delegate. - \sa {qmlmodels}{Data Models} + \sa {qml-data-models}{Data Models} */ QVariant QQuickRepeater::model() const { diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index 9ab926d627..1bb9b41d7e 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -743,7 +743,7 @@ void QQuickShaderEffect::setBlending(bool enable) \qmlproperty variant QtQuick2::ShaderEffect::mesh This property defines the mesh used to draw the ShaderEffect. It can hold - any mesh object deriving from \l QQuickShaderEffectMesh, such as \l GridMesh. + any \l GridMesh object. If a size value is assigned to this property, the ShaderEffect implicitly uses a \l GridMesh with the value as \l{GridMesh::resolution}{mesh resolution}. By default, this property is diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 73d9b672bf..4d1eb61581 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1484,6 +1484,8 @@ void QQuickTextEdit::paste() /*! + \qmlmethod QtQuick2::QQuickTextEdit::undo() + Undoes the last operation if undo is \l {canUndo}{available}. Deselects any current selection, and updates the selection start to the current cursor position. @@ -1496,6 +1498,8 @@ void QQuickTextEdit::undo() } /*! + \qmlmethod QtQuick2::QQuickTextEdit::redo() + Redoes the last operation if redo is \l {canRedo}{available}. */ diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 73e329b4c1..5b7bbaf998 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -1928,6 +1928,8 @@ void QQuickTextInput::paste() #endif // QT_NO_CLIPBOARD /*! + \qmlmethod QtQuick2::TextInput::undo() + Undoes the last operation if undo is \l {canUndo}{available}. Deselects any current selection, and updates the selection start to the current cursor position. @@ -1943,6 +1945,8 @@ void QQuickTextInput::undo() } /*! + \qmlmethod QtQuick2::TextInput::redo() + Redoes the last operation if redo is \l {canRedo}{available}. */ diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp index 2a56c7374c..87066f6d0f 100644 --- a/src/quick/items/qquickview.cpp +++ b/src/quick/items/qquickview.cpp @@ -149,7 +149,7 @@ void QQuickViewPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRectF size of the view. Alternatively the resizeMode may be set to SizeRootObjectToView which will resize the view to the size of the root object. - \sa {Exposing C++ Data to QML} + \sa {qtqml-cppintegration-exposecppattributes.html}{Exposing Attributes of C++ Types to QML} */ @@ -348,7 +348,7 @@ QList<QQmlError> QQuickView::errors() const is the initial size of the root item. Note though that since QML may load dynamically, that size may change. - \sa initialSize + \sa initialSize() */ void QQuickView::setResizeMode(ResizeMode mode) diff --git a/src/quick/items/qquickvisualdatamodel.cpp b/src/quick/items/qquickvisualdatamodel.cpp index 832476e670..2f7e1622ce 100644 --- a/src/quick/items/qquickvisualdatamodel.cpp +++ b/src/quick/items/qquickvisualdatamodel.cpp @@ -292,7 +292,7 @@ void QQuickVisualDataModel::componentComplete() Models can also be created directly in QML, using a \l{ListModel} or \l{XmlListModel}. - \sa {qmlmodels}{Data Models} + \sa {qml-data-models}{Data Models} */ QVariant QQuickVisualDataModel::model() const { @@ -326,7 +326,7 @@ void QQuickVisualDataModel::setModel(const QVariant &model) The delegate provides a template defining each item instantiated by a view. The index is exposed as an accessible \c index property. Properties of the - model are also available depending upon the type of \l {qmlmodels}{Data Model}. + model are also available depending upon the type of \l {qml-data-models}{Data Model}. */ QQmlComponent *QQuickVisualDataModel::delegate() const { diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 0a803c5aa6..3e1de8b2f0 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -926,7 +926,7 @@ QQuickWindow::~QQuickWindow() functions can be used to prevent this from happening, if handling the cleanup is not feasible in the application, at the cost of higher memory usage. - \sa sceneGraphInvalidated(), setPersistentOpenGLContext(), setPersistentSceneGraph(). + \sa sceneGraphInvalidated(), setPersistentOpenGLContext(), setPersistentSceneGraph() */ void QQuickWindow::releaseResources() @@ -2495,7 +2495,7 @@ QImage QQuickWindow::grabWindow() /*! Returns an incubation controller that splices incubation between frames for this window. QQuickView automatically installs this controller for you, - otherwise you will need to install it yourself using \l{QQmlEngine::setIncubationController} + otherwise you will need to install it yourself using \l{QQmlEngine::setIncubationController()}. The controller is owned by the window and will be destroyed when the window is deleted. |