Merge remote-tracking branch 'origin/stable' into dev

Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0

13 files changed, 19 insertions, 18 deletions

diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index be9c592228..763dd5251b 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -845,7 +845,7 @@ void QQuickCanvasItem::requestPaint()
     canvas renderer will redraw it. This will trigger the onPaint signal
     handler function.
 
-    \sa paint, requestPaint()
+    \sa onPaint, requestPaint()
 */
 
 void QQuickCanvasItem::markDirty(const QRectF& rect)
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index b6eb2db33d..b6d4f1073c 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -1103,7 +1103,8 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_scale(QV4::CallContext *ct
     rotating, and translating transformations in a single step.
 
     Each point on the canvas is multiplied by the matrix before anything is
-    drawn. The \l{HTML5 Canvas API} defines the transformation matrix as:
+    drawn. The \l{http://www.w3.org/TR/2dcontext/#transformations}{HTML Canvas 2D Context specification}
+    defines the transformation matrix as:
 
     \image qml-item-canvas-math.png
     where:
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index ed9d1838b8..605c485f6b 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -522,7 +522,7 @@ void QQuickDragAttached::setProposedAction(Qt::DropAction action)
     \li Drag.Internal (default) - start backwards compatible drags automatically
     \endlist
 
-    When using \l Drag.Automatic you should also define \l mimeData and bind the
+    When using \c Drag.Automatic you should also define \l mimeData and bind the
     \active property to the active property of \l MouseArea.drag.
  */
 
diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index 01166ab121..8d58ffbfae 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -107,7 +107,7 @@ QQuickDropAreaPrivate::~QQuickDropAreaPrivate()
     The \l keys property can be used to filter drag events which don't include
     a matching key.
 
-    The \l source property is communicated to the source of a drag event as
+    The \l drag.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
@@ -337,7 +337,7 @@ void QQuickDropArea::dropEvent(QDropEvent *event)
 
     The position of the drag event can be obtained from the \l x and \l y
     properties, and the \l keys property identifies the drag keys of the event
-    \l source.
+    \l {drag.source}{source}.
 
     The existence of specific drag types can be determined using the \l hasColor,
     \l hasHtml, \l hasText, and \l hasUrls properties.
@@ -378,7 +378,7 @@ void QQuickDropArea::dropEvent(QDropEvent *event)
 /*!
     \qmlproperty enumeration QtQuick::DragEvent::action
 
-    This property holds the action that the \l source is to perform on an accepted drop.
+    This property holds the action that the \l {drag.source}{source} is to perform on an accepted drop.
 
     The drop action may be one of:
 
diff --git a/src/quick/items/qquickfocusscope.cpp b/src/quick/items/qquickfocusscope.cpp
index f13a8ad3ca..bd8e58af35 100644
--- a/src/quick/items/qquickfocusscope.cpp
+++ b/src/quick/items/qquickfocusscope.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     components.  All the details are covered in the
     \l {Keyboard Focus in Qt Quick}{keyboard focus documentation}.
 
-    \sa {declarative/keyinteraction/focus}{Keyboard focus example}
+    \sa {Qt Quick Examples - Key Interaction}
 */
 QQuickFocusScope::QQuickFocusScope(QQuickItem *parent)
 : QQuickItem(parent)
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 43eb9ff6be..8587da5ac3 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -1787,7 +1787,7 @@ void QQuickGridView::setSnapMode(SnapMode mode)
     populated, or when the view's \l model changes. (In those cases, the \l populate transition is
     applied instead.) Additionally, this transition should \e not animate the height of the new item;
     doing so will cause any items beneath the new item to be laid out at the wrong position. Instead,
-    the height can be animated within a \l {ListView::onAdd()}{ListView.onAdd} in the delegate.
+    the height can be animated within a \l {ListView::onAdd}{ListView.onAdd} in the delegate.
 
     \sa addDisplaced, populate, ViewTransition
 */
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 72b0e588ec..8a11e31b9f 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -1819,7 +1819,7 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus)
     \value Bottom The center point of the bottom of the item.
     \value BottomRight The bottom-right corner of the item.
 
-    \sa transformOrigin
+    \sa transformOrigin(), setTransformOrigin()
 */
 
 /*!
@@ -2425,7 +2425,7 @@ void QQuickItem::stackAfter(const QQuickItem *sibling)
   Returns the window in which this item is rendered.
 
   The item does not have a window until it has been assigned into a scene. The
-  \l windowChanged signal provides a notification both when the item is entered
+  \l windowChanged() signal provides a notification both when the item is entered
   into a scene and when it is removed from a scene.
   */
 QQuickWindow *QQuickItem::window() const
@@ -4487,7 +4487,7 @@ void QQuickItemPrivate::deliverInputMethodEvent(QInputMethodEvent *e)
     QQuickItem::itemChange(change, value);
     \endcode
     typically at the end of your implementation, to ensure the
-    \l windowChanged signal will be emitted.
+    \l windowChanged() signal will be emitted.
   */
 void QQuickItem::itemChange(ItemChange change, const ItemChangeData &value)
 {
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index 1d1ea97925..279393b3ba 100644
--- a/src/quick/items/qquickitemanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -429,7 +429,7 @@ QAbstractAnimationJob* QQuickParentAnimation::transition(QQuickStateActions &act
     When an AnchorAnimation is used in a \l Transition, it will
     animate any AnchorChanges that have occurred during the state change.
     This can be overridden by setting a specific target item using the
-    \l target property.
+    \l {AnchorChanges::target}{AnchorChanges.target} property.
 
     \note AnchorAnimation can only be used in a \l Transition and in
     conjunction with an AnchorChange. It cannot be used in behaviors and
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index 0940fe0d22..4c09b78329 100644
--- a/src/quick/items/qquickitemviewtransition.cpp
+++ b/src/quick/items/qquickitemviewtransition.cpp
@@ -901,7 +901,7 @@ QQuickViewTransitionAttached::QQuickViewTransitionAttached(QObject *parent)
     \note The targetIndexes list only contains the indexes of items that are actually
     in view, or will be in the view once the relevant operation completes.
 
-    \sa QtQuick::ViewTransition::targetIndexes
+    \sa QtQuick::ViewTransition::targetItems
 */
 
 /*!
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 39fccaa19c..2dd61e386f 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -2485,7 +2485,7 @@ void QQuickListView::setSnapMode(SnapMode mode)
     populated, or when the view's \l model changes. (In those cases, the \l populate transition is
     applied instead.) Additionally, this transition should \e not animate the height of the new item;
     doing so will cause any items beneath the new item to be laid out at the wrong position. Instead,
-    the height can be animated within a \l {ListView::onAdd()}{ListView.onAdd} in the delegate.
+    the height can be animated within \l onAdd in the delegate.
 
     \sa addDisplaced, populate, ViewTransition
 */
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index b83c21428c..debe4b7497 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -271,7 +271,7 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const
 
     In some cases you may wish to use a Loader within a view delegate to improve delegate
     loading performance. This works well in most cases, but there is one important issue to
-    be aware of related to the \l{QtQuick::Component#creation-context}{creation context} of a Component.
+    be aware of related to the \l{QtQml::Component#Creation Context}{creation context} of a Component.
 
     In the following example, the \c index context property inserted by the ListView into \c delegateComponent's
     context will be inaccessible to Text, as the Loader will use the creation context of \c myComponent as the parent
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index 48c0f8e084..410f18e767 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -177,8 +177,8 @@ QT_BEGIN_NAMESPACE
     automatically rotates all content which is displayed, depending on how you
     hold it. But if orientation changes while primaryOrientation does NOT
     change, then probably you are using a device which does not rotate its own
-    display. In that case you may need to use \l Item.rotation or
-    \l Item.transform to rotate your content.
+    display. In that case you may need to use \l {Item::rotation}{Item.rotation} or
+    \l {Item::transform}{Item.transform} to rotate your content.
 */
 /*!
     \qmlattachedmethod int Screen::angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b)
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 63a3b5d820..b8c180e2fd 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -3317,7 +3317,7 @@ void QQuickWindow::resetOpenGLState()
     additional content like popups, dialogs, status bars, or similar
     in relation to the window.
 
-    The recommended orientation is \l Screen.orientation, but
+    The recommended orientation is \l {Screen::orientation}{Screen.orientation}, but
     an application doesn't have to support all possible orientations,
     and thus can opt to ignore the current screen orientation.