aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2015-02-02 12:43:49 +0100
committerNico Vertriest <nico.vertriest@digia.com>2015-02-04 08:30:13 +0000
commit566b23df8c31b50fc514a069564d23121d0f4ef9 (patch)
treef3e070f58012677cb6bca2467635d25d5962c1b2 /src/quick/items
parent9663b7b5c1a051b46a731b0587a4623a2ab21b0d (diff)
Doc: link issues qtdeclarative
Task-number: QTBUG-43810 Change-Id: I154ffa83512435c3e455937a3f81931a45d9e368 Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/qquickaccessibleattached.cpp4
-rw-r--r--src/quick/items/qquickdrag.cpp4
-rw-r--r--src/quick/items/qquickitem.cpp16
-rw-r--r--src/quick/items/qquickwindow.cpp6
4 files changed, 14 insertions, 16 deletions
diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp
index abb763c2eb..57b814964b 100644
--- a/src/quick/items/qquickaccessibleattached.cpp
+++ b/src/quick/items/qquickaccessibleattached.cpp
@@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE
}
\endqml
The \l role is set to \c Button to indicate the type of control.
- \l Accessible.name is the most important information and bound to the text on the button.
+ \l {Accessible::}{name} is the most important information and bound to the text on the button.
The name is a short and consise description of the control and should reflect the visual label.
In this case it is not clear what the button does with the name only, so \l description contains
an explanation.
@@ -123,7 +123,7 @@ QT_BEGIN_NAMESPACE
\li All interactive elements
\li \l focusable and \l focused
\li All elements that the user can interact with should have focusable set to \c true and
- set \l focus to \c true when they have the focus. This is important even for applications
+ set \c focus to \c true when they have the focus. This is important even for applications
that run on touch-only devices since screen readers often implement a virtual focus that
can be moved from item to item.
\row
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 5641c323ab..cff2f26092 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -516,8 +516,8 @@ void QQuickDragAttached::setProposedAction(Qt::DropAction action)
\endlist
When using \c Drag.Automatic you should also define \l mimeData and bind the
- \l active property to the active property of \l MouseArea.drag.
- */
+ \l active property to the active property of MouseArea : \l {MouseArea::drag.active}
+*/
QQuickDrag::DragType QQuickDragAttached::dragType() const
{
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 2722f48ce9..6a00f80171 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -1756,11 +1756,9 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus)
QQmlProperty(), or QMetaProperty::write() when you need to modify those
properties from C++. This ensures that the QML engine knows about the
property change. Otherwise, the engine won't be able to carry out your
- requested animation. For example, if you call \l setPosition() directly,
- any behavior that reacts to changes in the x or y properties will not take
- effect, as you are bypassing Qt's meta-object system. Note that these
- functions incur a slight performance penalty. For more details, see
- \l {Accessing Members of a QML Object Type from C++}.
+ requested animation.
+ Note that these functions incur a slight performance penalty. For more
+ details, see \l {Accessing Members of a QML Object Type from C++}.
\sa QQuickWindow, QQuickPaintedItem
*/
@@ -5059,7 +5057,7 @@ void QQuickItem::setZ(qreal v)
\endqml
\endtable
- \sa transform, Rotation
+ \sa Transform, Rotation
*/
/*!
\property QQuickItem::rotation
@@ -5085,7 +5083,7 @@ void QQuickItem::setZ(qreal v)
\endqml
\endtable
- \sa transform, Rotation
+ \sa Transform, Rotation
*/
qreal QQuickItem::rotation() const
{
@@ -5145,7 +5143,7 @@ void QQuickItem::setRotation(qreal r)
\endqml
\endtable
- \sa transform, Scale
+ \sa Transform, Scale
*/
/*!
\property QQuickItem::scale
@@ -5184,7 +5182,7 @@ void QQuickItem::setRotation(qreal r)
\endqml
\endtable
- \sa transform, Scale
+ \sa Transform, Scale
*/
qreal QQuickItem::scale() const
{
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index eaeb70b299..129c07da1d 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -3008,7 +3008,7 @@ QOpenGLContext *QQuickWindow::openglContext() const
(e.g. the user clicked the title bar close button). The CloseEvent contains
an accepted property which can be set to false to abort closing the window.
- \sa Window.closing()
+ \sa QQuickWindow::closing()
*/
/*!
@@ -3032,7 +3032,7 @@ QOpenGLContext *QQuickWindow::openglContext() const
This signal is emitted when the user tries to close the window.
- This signal includes a \a close parameter. The \a close \l accepted
+ This signal includes a \a close parameter. The \c {close.accepted}
property is true by default so that the window is allowed to close; but you
can implement an \c onClosing handler and set \c {close.accepted = false} if
you need to do something else before the window can be closed.
@@ -3894,7 +3894,7 @@ void QQuickWindow::resetOpenGLState()
This is equivalent to calling showFullScreen(), showMaximized(), or showNormal(),
depending on the platform's default behavior for the window type and flags.
- \sa showFullScreen(), showMaximized(), showNormal(), hide(), flags()
+ \sa showFullScreen(), showMaximized(), showNormal(), hide(), QQuickItem::flags()
*/
/*!