Doc: Fix broken links

Change-Id: Ie7408409ddbaa354370267f2dd74326ec56a4186
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

33 files changed, 46 insertions, 48 deletions

diff --git a/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc b/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
index 7869383ca2..a8ba96a10a 100644
--- a/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
+++ b/examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc
@@ -49,7 +49,7 @@
 
     We will focus on the \c TextBalloon class first and continue with the
     \c textballoons.qml file. For an example on how to implement a \l {Qt Quick}
-    plugin please look at \l{declarative/tutorials/extending/chapter6-plugins}
+    plugin please look at \l{Chapter 6: Writing an Extension Plugin}
     {Writing an Extension Plugin}
 
     \section1 TextBalloon Class Declaration
diff --git a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
index e3cef52bf7..56dcf6f396 100644
--- a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
+++ b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
@@ -171,7 +171,7 @@
     The application is a straightforward QML application, with a
     QGuiApplication and a QQuickView that we pass a .qml file. To make
     use of the BezierCurve item, we need to register it in the QML
-    engine, using the qmlRegisterType function. We give it the name
+    engine, using the qmlRegisterType() function. We give it the name
     BezierCurve and make it part of the \c {CustomGeometry 1.0}
     module.
 
diff --git a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
index 3a14dd465a..8b0f103f0c 100644
--- a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
+++ b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
@@ -116,7 +116,7 @@ states (\e on and \e off).
 This second function is called when the knob is released and we want to make sure that the knob does not end up between states
 (neither \e on nor \e off). If it is the case call the \c toggle() function otherwise we do nothing.
 
-For more information on scripts see \l{Using JavaScript Expressions in QML}.
+For more information on scripts see \l{JavaScript Expressions in QML Documents}.
 
 \section2 Transition
 \snippet ui-components/slideswitch/content/Switch.qml 7
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index a1c216dce0..97dc3aba1f 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -715,7 +715,7 @@ void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRo
     with a combined value of all key roles that is not already present in
     the model.
 
-    \sa {RSS News}
+    \sa {Qt Quick Demo - RSS News}
 */
 
 QQuickXmlListModel::QQuickXmlListModel(QObject *parent)
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index baaae86870..dfe4524c7c 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -502,7 +502,7 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size)
     Note that the sprite image will be scaled to a square based on the size of
     the particle being rendered.
 
-    For full details, see the \l{Sprite Animation} overview.
+    For full details, see the \l{Sprite Animations} overview.
 */
 /*!
     \qmlproperty url QtQuick.Particles::ImageParticle::colorTable
diff --git a/src/qml/doc/src/cppintegration/contextproperties.qdoc b/src/qml/doc/src/cppintegration/contextproperties.qdoc
index abdc18981a..d30cc87345 100644
--- a/src/qml/doc/src/cppintegration/contextproperties.qdoc
+++ b/src/qml/doc/src/cppintegration/contextproperties.qdoc
@@ -91,7 +91,7 @@ following examples:
     \li \l {Models and Views: AbstractItemModel Example}{AbstractItemModel}
 \endlist
 
-demonstrating the use of QStringList, \l{QList<QObject*>}-based models and
+demonstrating the use of QStringList, QList<QObject*>-based models and
 QAbstractItemModel in QML views.
 
 Also see the QQmlContext documentation for more information.
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index ee5316c19f..68233747b7 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -59,7 +59,7 @@ instance which already has a parent.
 \section1 Basic Qt Data Types
 
 By default, QML recognizes the following Qt data types, which are
-automatically converted to a corresponding \l {QML Basic Type}{QML basic type}
+automatically converted to a corresponding \l {QML Basic Types}{QML basic type}
 when passed from C++ to QML and vice-versa:
 
 \table
diff --git a/src/qml/doc/src/cppintegration/topic.qdoc b/src/qml/doc/src/cppintegration/topic.qdoc
index 4d12ab9d08..67e76e3e5e 100644
--- a/src/qml/doc/src/cppintegration/topic.qdoc
+++ b/src/qml/doc/src/cppintegration/topic.qdoc
@@ -98,7 +98,7 @@ more information.
 \section1 Defining QML Types from C++
 
 QML types can be defined in C++ and then registered with the \l{qtqml-typesystem-topic.html}{QML
-type system}. This allows a C++ class to be instantiated as a \l {QML object type}, enabling custom
+type system}. This allows a C++ class to be instantiated as a \l {QML Object Types}{QML object type}, enabling custom
 object types to be implemented in C++ and integrated into existing QML code. A C++ class may be also
 registered for other purposes: for example, it could be registered as a \e {Singleton Type} to enable a
 single class instance to be imported by QML code, or it could be registered to enable the
diff --git a/src/qml/doc/src/javascript/expressions.qdoc b/src/qml/doc/src/javascript/expressions.qdoc
index a8e6fc8ac0..13238b2e43 100644
--- a/src/qml/doc/src/javascript/expressions.qdoc
+++ b/src/qml/doc/src/javascript/expressions.qdoc
@@ -71,7 +71,7 @@ logic.  There are four ways that JavaScript can be used in a QML document:
   \li \l{Method Attributes}{custom methods} can be defined
       in QML files as JavaScript functions
   \li JavaScript files providing functions and variables can be
-      \l{Importing JavaScript Files in QML Documents}{imported} in a QML
+      \l{Importing JavaScript Resources in QML}{imported} in a QML
       document
 \endlist
 
@@ -103,7 +103,7 @@ property binding definition, as long as the result of the expression is a
 value whose type can be assigned to the property.
 
 There are two ways to define a property binding: the first (and most common)
-is, as previously shown, in a \l{QML Object Attributes#property-initialization}
+is, as previously shown, in a \l{QML Object Attributes#Value Assignment on Initialization}
 {property initialization}.  The second (and much rarer) way is to assign the
 property a function returned from the \l{Qt::binding()}{Qt.binding()} function,
 from within imperative JavaScript code, as shown below:
@@ -259,7 +259,7 @@ Item {
 \endqml
 
 For more information about loading external JavaScript files into QML, read
-the section about \l{Importing JavaScript Files in QML Documents}.
+the section about \l{Importing JavaScript Resources in QML}.
 
 
 
diff --git a/src/qml/doc/src/javascript/imports.qdoc b/src/qml/doc/src/javascript/imports.qdoc
index fa9aa9794c..d70d33fee6 100644
--- a/src/qml/doc/src/javascript/imports.qdoc
+++ b/src/qml/doc/src/javascript/imports.qdoc
@@ -32,7 +32,7 @@
 \l{qtqml-javascript-resources.html}{JavaScript resources} may be imported by
 QML documents and other JavaScript resources.  JavaScript resources may be
 imported via either relative or absolute URLs.  In the case of a relative URL,
-the location is resolved relative to the location of the \l {QML Document} or
+the location is resolved relative to the location of the \l {QML Documents}{QML document} or
 \l{qtqml-javascript-resources.html}{JavaScript Resource} that contains the
 import.  If the script file is not accessible, an error will occur.  If the
 JavaScript needs to be fetched from a network resource, the component's
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index b4b8fce162..cd4e86bd31 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -51,7 +51,7 @@
   \fn void qmlClearTypeRegistrations()
   \relates QQmlEngine
 
-  Clears all stored type registrations, such as those produced with \l qmlRegisterType.
+  Clears all stored type registrations, such as those produced with qmlRegisterType().
 
   Do not call this function while a QQmlEngine exists or behavior will be undefined.
   Any existing QQmlEngines must be deleted before calling this function.  This function
diff --git a/src/qml/doc/src/qmllanguageref/documents/scope.qdoc b/src/qml/doc/src/qmllanguageref/documents/scope.qdoc
index 9da77a4905..870eb21a07 100644
--- a/src/qml/doc/src/qmllanguageref/documents/scope.qdoc
+++ b/src/qml/doc/src/qmllanguageref/documents/scope.qdoc
@@ -76,7 +76,7 @@ with local variables declared in another.
 
 \section1 Type Names and Imported JavaScript Files
 
-\l {QML Document}s include import statements that define the type names
+\l {QML Documents} include import statements that define the type names
 and JavaScript files visible to the document.  In addition to their use in the
 QML declaration itself, type names are used by JavaScript code when accessing
 \l {Attached Properties} and enumeration values.
diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc
index bf457d7ee6..a0e5202174 100644
--- a/src/qml/doc/src/whatsnew.qdoc
+++ b/src/qml/doc/src/whatsnew.qdoc
@@ -40,8 +40,8 @@ a summary of the new changes:
 \li The 'with' statement has been deprecated and is slated for removal in a
     future version of the language.
 \li New \l Qt.platform object with an os property
-\li New \l qmlClearTypeRegistations() function drops all data from qmlRegisterType calls
-\li New \l qmlRegisterType function for registering composite types.
+\li New \l qmlClearTypeRegistrations() function drops all data from qmlRegisterType() calls
+\li New \l qmlRegisterType() function for registering composite types.
 \endlist
 
 \section2 New Submodule
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index bc804c4f2d..cb05a2bef8 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -218,7 +218,7 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject)
 
     Components are often defined by \l {{QML Documents}}{component files} -
     that is, \c .qml files. The \e Component type essentially allows QML components
-    to be defined inline, within a \l {QML Document}{QML document}, rather than as a separate QML file.
+    to be defined inline, within a \l {QML Documents}{QML document}, rather than as a separate QML file.
     This may be useful for reusing a small component within a QML file, or for defining
     a component that logically belongs with other QML components within a file.
 
@@ -235,7 +235,7 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject)
     two \l Loader objects). Because Component is not derived from Item, you cannot
     anchor anything to it.
 
-    Defining a \c Component is similar to defining a \l {QML Document}{QML document}.
+    Defining a \c Component is similar to defining a \l {QML Documents}{QML document}.
     A QML document has a single top-level item that defines the behavior and
     properties of that component, and cannot define properties or behavior outside
     of that top-level item. In the same way, a \c Component definition contains a single
diff --git a/src/qml/types/qqmltimer.cpp b/src/qml/types/qqmltimer.cpp
index 7d1c41aeab..32018c1f03 100644
--- a/src/qml/types/qqmltimer.cpp
+++ b/src/qml/types/qqmltimer.cpp
@@ -109,7 +109,7 @@ public:
     elapsed time will be reset to 0, and the Timer will be triggered
     1000ms later.
 
-    \sa {declarative/toys/clocks}{Clocks example}
+    \sa {Qt Quick Demo - Clocks}
 */
 
 QQmlTimer::QQmlTimer(QObject *parent)
diff --git a/src/qml/types/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp
index 2ce9ca36d8..1fed95eb85 100644
--- a/src/qml/types/qquickpackage.cpp
+++ b/src/qml/types/qquickpackage.cpp
@@ -73,8 +73,7 @@ QT_BEGIN_NAMESPACE
 
     \snippet quick/views/package/view.qml 0
 
-    \sa {quick/views/package}{Package example}, {quick/demos/photoviewer}{Photo
-    Viewer example}, {Qt QML}
+    \sa {quick/views/package}{Package example}, {Qt Quick Demo - Photo Viewer}, {Qt QML}
 */
 
 /*!
diff --git a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
index ba9ec9229e..b5dd961ea9 100644
--- a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
+++ b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
@@ -245,7 +245,7 @@ To visualize data, bind the view's \c model property to a model and the
     }
     \endqml
 
-    The \l{declarative/rssnews}{RSS News demo} shows how XmlListModel can
+    The \l{Qt Quick Demo - RSS News}{RSS News demo} shows how XmlListModel can
     be used to display an RSS feed.
 
 
diff --git a/src/quick/doc/src/concepts/positioning/layouts.qdoc b/src/quick/doc/src/concepts/positioning/layouts.qdoc
index 35be2f6235..fef55582dc 100644
--- a/src/quick/doc/src/concepts/positioning/layouts.qdoc
+++ b/src/quick/doc/src/concepts/positioning/layouts.qdoc
@@ -32,7 +32,7 @@
 
 Positioner items are container items that manage the positions of
 items in a declarative user interface. Positioners behave in a similar way to
-the \l{Widgets and Layouts}{layout managers} used with standard Qt widgets,
+the \l{Qt Widgets}{layout managers} used with standard Qt widgets,
 except that they are also containers in their own right.
 
 Positioners make it easier to work with many items when they need
diff --git a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
index 1c48058510..ad8b2f3b63 100644
--- a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
+++ b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
@@ -185,7 +185,7 @@ command-line parameter "-reverse":
 qmlviewer myapp.qml -reverse
 \endcode
 
-The layout direction can also be set from C++ by calling the static function \l QApplication::setLayoutDirection():
+The layout direction can also be set from C++ by calling the static function \l QGuiApplication::setLayoutDirection():
 
 \code
 QApplication app(argc, argv);
diff --git a/src/quick/doc/src/concepts/statesanimations/animations.qdoc b/src/quick/doc/src/concepts/statesanimations/animations.qdoc
index dcf1d49a72..1a324b1983 100644
--- a/src/quick/doc/src/concepts/statesanimations/animations.qdoc
+++ b/src/quick/doc/src/concepts/statesanimations/animations.qdoc
@@ -65,6 +65,8 @@ To create an animation, use an appropriate animation type for the type of
 the property that is to be animated, and apply the animation depending on the
 type of behavior that is required.
 
+\sa {Qt Quick Examples - Animation}
+
 \section1 Triggering Animations
 
 There are several ways of setting animation to an object.
@@ -218,9 +220,6 @@ The \l SequentialAnimation type is also useful for playing
 \l{qml-transition-animations}{transition animations} because animations are
 played in parallel inside transitions.
 
-See the \l {declarative/animation/basics}{Animation basics example} for a
-demonstration of creating and combining multiple animations in QML.
-
 \keyword qml-controlling-animations
 \section1 Controlling Animations
 
diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc
index bd07c9a98d..a4428c5818 100644
--- a/src/quick/doc/src/tutorial.qdoc
+++ b/src/quick/doc/src/tutorial.qdoc
@@ -29,7 +29,6 @@
 \page qml-tutorial.html
 \title QML Tutorial
 \brief An introduction to the basic concepts and features of QML.
-\previouspage Introduction to the QML Language
 \nextpage QML Tutorial 1 - Basic Types
 
 This tutorial gives an introduction to QML, the declarative language for Qt Quick. It doesn't cover everything;
diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index 4c16a1e9e2..64b8f257dc 100644
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -174,7 +174,7 @@ struct AnimatedSpriteVertices {
     as multiple frames in the same image file. You can play it at a fixed speed, at the
     frame rate of your display, or manually advance and control the progress.
 
-    For details of how a sprite animation is defined see the \l{Sprite Animation} overview.
+    For details of how a sprite animation is defined see the \l{Sprite Animations} overview.
     Note that the AnimatedSprite type does not use Sprite types to define multiple animations,
     but instead encapsulates a single animation itself.
 */
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 1c6168fbc5..c9e6d4d7e2 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -1248,7 +1248,7 @@ bool QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
             \image gridview-layout-toptobottom-rtl-btt.png
     \endtable
 
-    \sa {quick/modelviews/gridview}{GridView example}
+    \sa {QML Data Models}, ListView, PathView, {Qt Quick Examples - Views}
 */
 
 QQuickGridView::QQuickGridView(QQuickItem *parent)
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index 534ad0e2f4..b840ee421c 100644
--- a/src/quick/items/qquickitemanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
     ParentChange that has occurred during the state change. This can be
     overridden by setting a specific target item using the \l target property.
 
-    \sa {Animation and Transitions in Qt Quick}, {declarative/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}
 */
 QQuickParentAnimation::QQuickParentAnimation(QObject *parent)
     : QQuickAnimationGroup(*(new QQuickParentAnimationPrivate), parent)
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 22d8176086..c55f9ef696 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -1744,7 +1744,7 @@ bool QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
             \image listview-layout-righttoleft.png
     \endtable
 
-    \sa {QML Data Models}, GridView, {quick/modelviews/listview}{ListView examples}
+    \sa {QML Data Models}, GridView, PathView, {Qt Quick Examples - Views}
 */
 QQuickListView::QQuickListView(QQuickItem *parent)
     : QQuickItemView(*(new QQuickListViewPrivate), parent)
@@ -1907,7 +1907,8 @@ QQuickListView::~QQuickListView()
     so as to stay with the current item, unless the highlightFollowsCurrentItem
     property is false.
 
-    \sa highlightItem, highlightFollowsCurrentItem, {quick/modelviews/listview}{ListView examples}
+    \sa highlightItem, highlightFollowsCurrentItem,
+    {Qt Quick Examples - Views#Highlight demonstrates adding a custom highlight to a ListView.}{ListView highlight example}
 */
 
 /*!
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index d8132bdd12..696cf145da 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -553,7 +553,7 @@ void QQuickPathViewPrivate::setDragging(bool d)
     to set \e {clip: true} in order to have the out of view items clipped
     nicely.
 
-    \sa Path, {quick/modelviews/pathview}{PathView example}
+    \sa Path, {QML Data Models}, ListView, GridView, {Qt Quick Examples - Views}
 */
 
 QQuickPathView::QQuickPathView(QQuickItem *parent)
diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp
index b2bfb69bab..00a265c814 100644
--- a/src/quick/items/qquicksprite.cpp
+++ b/src/quick/items/qquicksprite.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
     can be in the middle of an image file, or split along multiple rows, as long as they form
     a contiguous line wrapping to the next row of the file from the left edge of the file.
 
-    For full details, see the \l{Sprite Animation} overview.
+    For full details, see the \l{Sprite Animations} overview.
 */
 /*!
     \qmlproperty int QtQuick::Sprite::duration
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index 28f1397cc9..a90aa9ace2 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -172,7 +172,7 @@ struct SpriteVertices {
     SpriteSequence renders and controls a list of animations defined
     by \l Sprite types.
 
-    For full details, see the \l{Sprite Animation} overview.
+    For full details, see the \l{Sprite Animations} overview.
 */
 /*!
     \qmlproperty bool QtQuick::SpriteSequence::running
diff --git a/src/quick/items/qquicktranslate.cpp b/src/quick/items/qquicktranslate.cpp
index 1ea5a6f7d6..93104ffa7a 100644
--- a/src/quick/items/qquicktranslate.cpp
+++ b/src/quick/items/qquicktranslate.cpp
@@ -335,7 +335,7 @@ public:
 
     \image axisrotation.png
 
-    \sa {declarative/ui-components/dialcontrol}{Dial Control example}, {declarative/toys/clocks}{Clocks example}
+    \sa {declarative/ui-components/dialcontrol}{Dial Control example}, {Qt Quick Demo - Clocks}
 */
 QQuickRotation::QQuickRotation(QObject *parent)
     : QQuickTransform(*new QQuickRotationPrivate, parent)
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index dd338af1e3..9798974788 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -2768,7 +2768,7 @@ QOpenGLFramebufferObject *QQuickWindow::renderTarget() const
     Grabs the contents of the window and returns it as an image.
 
     It is possible to call the grabWindow() function when the window is not
-    visible. This requires that the window is \l{QWindow::create} {created}
+    visible. This requires that the window is \l{QWindow::create()} {created}
     and has a valid size and that no other QQuickWindow instances are rendering
     in the same process.
 
diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp
index 6a762bea68..342cf2eaff 100644
--- a/src/quick/util/qquickanimation.cpp
+++ b/src/quick/util/qquickanimation.cpp
@@ -673,7 +673,7 @@ QQuickAbstractAnimation::ThreadingModel QQuickAbstractAnimation::threadingModel(
     }
     \endcode
 
-    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}
 */
 QQuickPauseAnimation::QQuickPauseAnimation(QObject *parent)
 : QQuickAbstractAnimation(*(new QQuickPauseAnimationPrivate), parent)
@@ -752,7 +752,7 @@ QAbstractAnimationJob* QQuickPauseAnimation::transition(QQuickStateActions &acti
     \l{PropertyAnimation::}{properties} are explicitly set for the animation,
     then those are used instead.
 
-    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}
 */
 QQuickColorAnimation::QQuickColorAnimation(QObject *parent)
 : QQuickPropertyAnimation(parent)
@@ -1275,7 +1275,7 @@ QAbstractAnimationJob* QQuickPropertyAction::transition(QQuickStateActions &acti
     changes in the number value that it is tracking. If this is the case, use
     SmoothedAnimation instead.
 
-    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}
 */
 QQuickNumberAnimation::QQuickNumberAnimation(QObject *parent)
 : QQuickPropertyAnimation(parent)
@@ -1378,7 +1378,7 @@ void QQuickNumberAnimation::setTo(qreal t)
     sources. The \l {Animation and Transitions in Qt Quick} documentation shows a
     variety of methods for creating animations.
 
-    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}
 */
 QQuickVector3dAnimation::QQuickVector3dAnimation(QObject *parent)
 : QQuickPropertyAnimation(parent)
@@ -1478,7 +1478,7 @@ void QQuickVector3dAnimation::setTo(QVector3D t)
     sources. The \l {Animation and Transitions in Qt Quick} documentation shows a
     variety of methods for creating animations.
 
-    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}
 */
 QVariant _q_interpolateShortestRotation(qreal &f, qreal &t, qreal progress)
 {
@@ -1711,7 +1711,7 @@ QQmlListProperty<QQuickAbstractAnimation> QQuickAnimationGroup::animations()
     ParallelAnimation, it cannot be individually started and stopped; the
     SequentialAnimation or ParallelAnimation must be started and stopped as a group.
 
-    \sa ParallelAnimation, {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
+    \sa ParallelAnimation, {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}
 */
 
 QQuickSequentialAnimation::QQuickSequentialAnimation(QObject *parent) :
@@ -1801,7 +1801,7 @@ QAbstractAnimationJob* QQuickSequentialAnimation::transition(QQuickStateActions
     ParallelAnimation, it cannot be individually started and stopped; the
     SequentialAnimation or ParallelAnimation must be started and stopped as a group.
 
-    \sa SequentialAnimation, {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
+    \sa SequentialAnimation, {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}
 */
 QQuickParallelAnimation::QQuickParallelAnimation(QObject *parent) :
     QQuickAnimationGroup(parent)
@@ -1984,7 +1984,7 @@ void QQuickBulkValueAnimator::topLevelAnimationLoopChanged()
     Note that PropertyAnimation inherits the abstract \l Animation type.
     This includes additional properties and methods for controlling the animation.
 
-    \sa {Animation and Transitions in Qt Quick}, {qml/animation/basics}{Animation basics example}
+    \sa {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}
 */
 
 QQuickPropertyAnimation::QQuickPropertyAnimation(QObject *parent)
diff --git a/src/quick/util/qquicksmoothedanimation.cpp b/src/quick/util/qquicksmoothedanimation.cpp
index 53e3520bde..017fe39003 100644
--- a/src/quick/util/qquicksmoothedanimation.cpp
+++ b/src/quick/util/qquicksmoothedanimation.cpp
@@ -351,7 +351,7 @@ void QSmoothedAnimation::init()
     sources. The \l {Animation and Transitions in Qt Quick} documentation shows a
     variety of methods for creating animations.
 
-    \sa SpringAnimation, NumberAnimation, {Animation and Transitions in Qt Quick}, {declarative/animation/basics}{Animation basics example}
+    \sa SpringAnimation, NumberAnimation, {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}
 */
 
 QQuickSmoothedAnimation::QQuickSmoothedAnimation(QObject *parent)
diff --git a/src/quick/util/qquickspringanimation.cpp b/src/quick/util/qquickspringanimation.cpp
index f663491a58..efaa5ba56c 100644
--- a/src/quick/util/qquickspringanimation.cpp
+++ b/src/quick/util/qquickspringanimation.cpp
@@ -365,7 +365,7 @@ void QQuickSpringAnimationPrivate::updateMode()
     sources. The \l {Animation and Transitions in Qt Quick} documentation shows a
     variety of methods for creating animations.
 
-    \sa SmoothedAnimation, {Animation and Transitions in Qt Quick}, {declarative/animation/basics}{Animation basics example}, {declarative/toys/clocks}{Clocks example}
+    \sa SmoothedAnimation, {Animation and Transitions in Qt Quick}, {Qt Quick Examples - Animation}, {Qt Quick Demo - Clocks}
 */
 
 QQuickSpringAnimation::QQuickSpringAnimation(QObject *parent)