Fix various broken links in documentation

Change-Id: I9e2dac37d18e3ca62e4a92be25e5c2e60ffeba00
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>

10 files changed, 50 insertions, 50 deletions

diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 10996d8d2b..6ed2b0151f 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -663,7 +663,7 @@ void QQuickAbstractAnimationPrivate::animationFinished(QAbstractAnimationJob*)
     }
     \endcode
 
-    \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
 */
 QQuickPauseAnimation::QQuickPauseAnimation(QObject *parent)
 : QQuickAbstractAnimation(*(new QQuickPauseAnimationPrivate), parent)
@@ -733,7 +733,7 @@ QAbstractAnimationJob* QQuickPauseAnimation::transition(QQuickStateActions &acti
 
     Like any other animation type, a ColorAnimation 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.
 
     For convenience, when a ColorAnimation is used in a \l Transition, it will
@@ -742,7 +742,7 @@ QAbstractAnimationJob* QQuickPauseAnimation::transition(QQuickStateActions &acti
     \l{PropertyAnimation::}{properties} are explicitly set for the animation,
     then those are used instead.
 
-    \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
 */
 QQuickColorAnimation::QQuickColorAnimation(QObject *parent)
 : QQuickPropertyAnimation(parent)
@@ -781,7 +781,7 @@ QQuickColorAnimation::~QQuickColorAnimation()
     \l Transition, or the current value of the property at the moment the
     \l Behavior is triggered.
 
-    \sa {QML Animation and Transitions}
+    \sa {Animation and Transitions in Qt Quick}
 */
 QColor QQuickColorAnimation::from() const
 {
@@ -804,7 +804,7 @@ void QQuickColorAnimation::setFrom(const QColor &f)
     \l Transition, or the value of the property change that triggered the
     \l Behavior.
 
-    \sa {QML Animation and Transitions}
+    \sa {Animation and Transitions in Qt Quick}
 */
 QColor QQuickColorAnimation::to() const
 {
@@ -1025,7 +1025,7 @@ QAbstractAnimationJob* QQuickScriptAction::transition(QQuickStateActions &action
     PropertyAction object) so that the rotation animation begins with the
     correct transform origin.
 
-    \sa {QML Animation and Transitions}, QtQml
+    \sa {Animation and Transitions in Qt Quick}, QtQml
 */
 QQuickPropertyAction::QQuickPropertyAction(QObject *parent)
 : QQuickAbstractAnimation(*(new QQuickPropertyActionPrivate), parent)
@@ -1258,14 +1258,14 @@ QAbstractAnimationJob* QQuickPropertyAction::transition(QQuickStateActions &acti
 
     Like any other animation type, a NumberAnimation 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.
 
     Note that NumberAnimation may not animate smoothly if there are irregular
     changes in the number value that it is tracking. If this is the case, use
     SmoothedAnimation instead.
 
-    \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
 */
 QQuickNumberAnimation::QQuickNumberAnimation(QObject *parent)
 : QQuickPropertyAnimation(parent)
@@ -1314,7 +1314,7 @@ void QQuickNumberAnimation::init()
     \l Transition, or the current value of the property at the moment the
     \l Behavior is triggered.
 
-    \sa {QML Animation and Transitions}
+    \sa {Animation and Transitions in Qt Quick}
 */
 
 qreal QQuickNumberAnimation::from() const
@@ -1337,7 +1337,7 @@ void QQuickNumberAnimation::setFrom(qreal f)
     \l Transition, or the value of the property change that triggered the
     \l Behavior.
 
-    \sa {QML Animation and Transitions}
+    \sa {Animation and Transitions in Qt Quick}
 */
 qreal QQuickNumberAnimation::to() const
 {
@@ -1365,10 +1365,10 @@ void QQuickNumberAnimation::setTo(qreal t)
 
     Like any other animation type, a Vector3dAnimation 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}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
 */
 QQuickVector3dAnimation::QQuickVector3dAnimation(QObject *parent)
 : QQuickPropertyAnimation(parent)
@@ -1392,7 +1392,7 @@ QQuickVector3dAnimation::~QQuickVector3dAnimation()
     \l Transition, or the current value of the property at the moment the
     \l Behavior is triggered.
 
-    \sa {QML Animation and Transitions}
+    \sa {Animation and Transitions in Qt Quick}
 */
 QVector3D QQuickVector3dAnimation::from() const
 {
@@ -1414,7 +1414,7 @@ void QQuickVector3dAnimation::setFrom(QVector3D f)
     \l Transition, or the value of the property change that triggered the
     \l Behavior.
 
-    \sa {QML Animation and Transitions}
+    \sa {Animation and Transitions in Qt Quick}
 */
 QVector3D QQuickVector3dAnimation::to() const
 {
@@ -1465,10 +1465,10 @@ void QQuickVector3dAnimation::setTo(QVector3D t)
 
     Like any other animation type, a RotationAnimation 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}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
 */
 QVariant _q_interpolateShortestRotation(qreal &f, qreal &t, qreal progress)
 {
@@ -1544,7 +1544,7 @@ QQuickRotationAnimation::~QQuickRotationAnimation()
     \l Transition, or the current value of the property at the moment the
     \l Behavior is triggered.
 
-    \sa {QML Animation and Transitions}
+    \sa {Animation and Transitions in Qt Quick}
 */
 qreal QQuickRotationAnimation::from() const
 {
@@ -1566,7 +1566,7 @@ void QQuickRotationAnimation::setFrom(qreal f)
     \l Transition, or the value of the property change that triggered the
     \l Behavior.
 
-    \sa {QML Animation and Transitions}
+    \sa {Animation and Transitions in Qt Quick}
 */
 qreal QQuickRotationAnimation::to() const
 {
@@ -1694,14 +1694,14 @@ QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations()
 
     Like any other animation type, a SequentialAnimation 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.
 
     \note Once an animation has been grouped into a SequentialAnimation or
     ParallelAnimation, it cannot be individually started and stopped; the
     SequentialAnimation or ParallelAnimation must be started and stopped as a group.
 
-    \sa ParallelAnimation, {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
+    \sa ParallelAnimation, {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
 */
 
 QQuickSequentialAnimation::QQuickSequentialAnimation(QObject *parent) :
@@ -1764,14 +1764,14 @@ QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions
 
     Like any other animation type, a ParallelAnimation 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.
 
     \note Once an animation has been grouped into a SequentialAnimation or
     ParallelAnimation, it cannot be individually started and stopped; the
     SequentialAnimation or ParallelAnimation must be started and stopped as a group.
 
-    \sa SequentialAnimation, {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
+    \sa SequentialAnimation, {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
 */
 QQuickParallelAnimation::QQuickParallelAnimation(QObject *parent) :
     QQuickAnimationGroup(parent)
@@ -1926,12 +1926,12 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
 
     Depending on how the animation is used, the set of properties normally used will be
     different. For more information see the individual property documentation, as well
-    as the \l{QML Animation and Transitions} introduction.
+    as the \l{Animation and Transitions in Qt Quick} introduction.
 
     Note that PropertyAnimation inherits the abstract \l Animation type.
     This includes additional properties and methods for controlling the animation.
 
-    \sa {QML Animation and Transitions}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
 */
 
 QQuickPropertyAnimation::QQuickPropertyAnimation(QObject *parent)
@@ -1983,7 +1983,7 @@ void QQuickPropertyAnimation::setDuration(int duration)
     \l Transition, or the current value of the property at the moment the
     \l Behavior is triggered.
 
-    \sa {QML Animation and Transitions}
+    \sa {Animation and Transitions in Qt Quick}
 */
 QVariant QQuickPropertyAnimation::from() const
 {
@@ -2010,7 +2010,7 @@ void QQuickPropertyAnimation::setFrom(const QVariant &f)
     \l Transition, or the value of the property change that triggered the
     \l Behavior.
 
-    \sa {QML Animation and Transitions}
+    \sa {Animation and Transitions in Qt Quick}
 */
 QVariant QQuickPropertyAnimation::to() const
 {
@@ -2386,7 +2386,7 @@ void QQuickPropertyAnimation::setProperties(const QString &prop)
 
     As seen in the above example, properties is specified as a comma-separated string of property names to animate.
 
-    \sa exclude, {QML Animation and Transitions}
+    \sa exclude, {Animation and Transitions in Qt Quick}
 */
 QQmlListProperty<QObject> QQuickPropertyAnimation::targets()
 {
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index 7a0eba88d4..43784603ca 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -243,7 +243,7 @@ void QQuickAnimationController::componentFinalized()
 
     The animation controller's progress value will be automatically updated while the animation is running.
 
-    \sa completeToEnd(), progress()
+    \sa completeToEnd(), progress
 */
 void QQuickAnimationController::completeToBeginning()
 {
@@ -272,7 +272,7 @@ void QQuickAnimationController::completeToBeginning()
 
     The animation controller's progress value will be automatically updated while the animation is running.
 
-    \sa completeToBeginning(), progress()
+    \sa completeToBeginning(), progress
 */
 void QQuickAnimationController::completeToEnd()
 {
diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp
index 77ea7967b8..a58dbba28f 100644
--- a/src/quick/util/qquickbehavior.cpp
+++ b/src/quick/util/qquickbehavior.cpp
@@ -93,12 +93,12 @@ public:
     multiple animations within a Behavior, use ParallelAnimation or
     SequentialAnimation.
 
-    If a \l{States}{state change} has a \l Transition that matches the same property as a
+    If a \l{Qt Quick States}{state change} has a \l Transition that matches the same property as a
     Behavior, the \l Transition animation overrides the Behavior for that
     state change. For general advice on using Behaviors to animate state changes, see
-    \l{Using QML Behaviors with States}.
+    \l{Using Qt Quick Behaviors with States}.
 
-    \sa {QML Animation and Transitions}, {declarative/animation/behaviors}{Behavior example}, QtQml
+    \sa {Animation and Transitions in Qt Quick}, {declarative/animation/behaviors}{Behavior example}, QtQml
 */
 
 
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index a38e12d90f..c942959d07 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -814,7 +814,7 @@ bool QQuickCurve::hasRelativeY()
     The PathAttribute object allows attributes consisting of a name and
     a value to be specified for various points along a path.  The
     attributes are exposed to the delegate as
-    \l{qdeclarativeintroduction.html#attached-properties} {Attached Properties}.
+    \l{Attached Properties and Attached Signal Handlers} {Attached Properties}.
     The value of an attribute at any particular point along the path is interpolated
     from the PathAttributes bounding that point.
 
@@ -845,7 +845,7 @@ bool QQuickCurve::hasRelativeY()
 
     Note that using an existing Item property name such as "opacity" as an
     attribute is allowed.  This is because path attributes add a new
-    \l{qdeclarativeintroduction.html#attached-properties} {Attached Property}
+    \l{Attached Properties and Attached Signal Handlers} {Attached Property}
     which in no way clashes with existing properties.
 */
 
@@ -886,7 +886,7 @@ void QQuickPathAttribute::setName(const QString &name)
    \endqml
 
    In our delegate, we can then bind the \e rotation property to the
-   \l{qdeclarativeintroduction.html#attached-properties} {Attached Property}
+   \l{Attached Properties and Attached Signal Handlers} {Attached Property}
    \e PathView.itemRotation created for this attribute.
 
    \qml
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 6bd48e2900..48c00f1d51 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
 
     PropertyChanges is used to define the property values or bindings in a
     \l State. This enables an item's property values to be changed when it
-    \l {States}{changes between states}.
+    \l {Qt Quick States}{changes between states}.
 
     To create a PropertyChanges object, specify the \l target item whose
     properties are to be modified, and define the new property values or
@@ -119,7 +119,7 @@ QT_BEGIN_NAMESPACE
 
     \section2 Immediate property changes in transitions
 
-    When \l{QML Animation and Transitions}{Transitions} are used to animate
+    When \l{Animation and Transitions in Qt Quick}{Transitions} are used to animate
     state changes, they animate properties from their values in the current
     state to those defined in the new state (as defined by PropertyChanges
     objects). However, it is sometimes desirable to set a property value
@@ -129,7 +129,7 @@ QT_BEGIN_NAMESPACE
 
     See the PropertyAction documentation for more details.
 
-    \sa {declarative/animation/states}{states example}, {qmlstate}{States}, QtQml
+    \sa {declarative/animation/states}{states example}, {Qt Quick States}{Qt Quick States}, QtQml
 */
 
 /*!
diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp
index 9684cf6c0c..cf7ec9a4fc 100644
--- a/src/quick/util/qquicksmoothedanimation.cpp
+++ b/src/quick/util/qquicksmoothedanimation.cpp
@@ -348,10 +348,10 @@ void QSmoothedAnimation::init()
 
     Like any other animation type, a SmoothedAnimation 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 SpringAnimation, NumberAnimation, {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}
+    \sa SpringAnimation, NumberAnimation, {Animation and Transitions in Qt Quick}, {declarative/animation/basics}{Animation basics example}
 */
 
 QQuickSmoothedAnimation::QQuickSmoothedAnimation(QObject *parent)
diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp
index e5780f6087..97d003b4e7 100644
--- a/src/quick/util/qquickspringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -362,10 +362,10 @@ void QQuickSpringAnimationPrivate::updateMode()
 
     Like any other animation type, a SpringAnimation 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 SmoothedAnimation, {QML Animation and Transitions}, {declarative/animation/basics}{Animation basics example}, {declarative/toys/clocks}{Clocks example}
+    \sa SmoothedAnimation, {Animation and Transitions in Qt Quick}, {declarative/animation/basics}{Animation basics example}, {declarative/toys/clocks}{Clocks example}
 */
 
 QQuickSpringAnimation::QQuickSpringAnimation(QObject *parent)
diff --git a/src/quick/util/qquickstate.cpp b/src/quick/util/qquickstate.cpp
index 99f9819590..02d5a2373e 100644
--- a/src/quick/util/qquickstate.cpp
+++ b/src/quick/util/qquickstate.cpp
@@ -144,14 +144,14 @@ QQuickStateOperation::QQuickStateOperation(QObjectPrivate &dd, QObject *parent)
 
     Notice the default state is referred to using an empty string ("").
 
-    States are commonly used together with \l{QML Animation and Transitions}{Transitions} to provide
+    States are commonly used together with \l{Animation and Transitions in Qt Quick}{Transitions} to provide
     animations when state changes occur.
 
     \note Setting the state of an object from within another state of the same object is
     not allowed.
 
-    \sa {declarative/animation/states}{states example}, {qmlstates}{States},
-    {QML Animation and Transitions}{Transitions}, QtQml
+    \sa {declarative/animation/states}{states example}, {Qt Quick States}{Qt Quick States},
+    {Animation and Transitions in Qt Quick}{Transitions}, QtQml
 */
 QQuickState::QQuickState(QObject *parent)
 : QObject(*(new QQuickStatePrivate), parent)
diff --git a/src/quick/util/qquickstategroup.cpp b/src/quick/util/qquickstategroup.cpp
index 23a7348ded..9ffd0dede1 100644
--- a/src/quick/util/qquickstategroup.cpp
+++ b/src/quick/util/qquickstategroup.cpp
@@ -119,7 +119,7 @@ public:
    }
    \endqml
 
-   \sa {qmlstate}{States}, {QML Animation and Transitions}{Transitions}, {QtQml}
+   \sa {Qt Quick States}{Qt Quick States}, {Animation and Transitions in Qt Quick}{Transitions}, {QtQml}
 */
 
 QQuickStateGroup::QQuickStateGroup(QObject *parent)
@@ -158,7 +158,7 @@ QList<QQuickState *> QQuickStateGroup::states() const
   }
   \endqml
 
-  \sa {qmlstate}{States}
+  \sa {Qt Quick States}{Qt Quick States}
 */
 QQmlListProperty<QQuickState> QQuickStateGroup::statesProperty()
 {
@@ -219,7 +219,7 @@ void QQuickStateGroupPrivate::clear_states(QQmlListProperty<QQuickState> *list)
   }
   \endqml
 
-  \sa {QML Animation and Transitions}{Transitions}
+  \sa {Animation and Transitions in Qt Quick}{Transitions}
 */
 QQmlListProperty<QQuickTransition> QQuickStateGroup::transitionsProperty()
 {
@@ -276,7 +276,7 @@ void QQuickStateGroupPrivate::clear_transitions(QQmlListProperty<QQuickTransitio
   set), \c state will be a blank string. Likewise, you can return a
   state group to its base state by setting its current state to \c ''.
 
-  \sa {qmlstates}{States}
+  \sa {Qt Quick States}{Qt Quick States}
 */
 QString QQuickStateGroup::state() const
 {
diff --git a/src/quick/util/qquicktransition.cpp b/src/quick/util/qquicktransition.cpp
index 1548c07254..311ff5182b 100644
--- a/src/quick/util/qquicktransition.cpp
+++ b/src/quick/util/qquicktransition.cpp
@@ -94,7 +94,7 @@ QT_BEGIN_NAMESPACE
     \l Behavior, the Transition animation overrides the \l Behavior for that
     state change.
 
-    \sa {QML Animation and Transitions}, {declarative/animation/states}{states example}, {qmlstates}{States}, {QtQml}
+    \sa {Animation and Transitions in Qt Quick}, {declarative/animation/states}{states example}, {Qt Quick States}{Qt Quick States}, {QtQml}
 */
 
 //ParallelAnimationWrapper allows us to do a "callback" when the animation finishes, rather than connecting