14 files changed, 28 insertions, 31 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 22880c4086..846da64ea4 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -34,7 +34,7 @@ qhp.QtQuick.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtquick/qtquick.tags
 
-depends += qtcore qtxmlpatterns qtqml qtgui qtlinguist qtquickcontrols qtquicklayouts qtdoc qtquickdialogs
+depends += qtcore qtxmlpatterns qtqml qtgui qtlinguist qtquickcontrols qtquicklayouts qtdoc qtquickdialogs qtsensors qtwidgets
 
 headerdirs  += ..
 
diff --git a/src/quick/doc/src/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc
index be8b397a8e..aa44ef8a85 100644
--- a/src/quick/doc/src/advtutorial.qdoc
+++ b/src/quick/doc/src/advtutorial.qdoc
@@ -90,7 +90,7 @@ is the \l SystemPalette item. This provides access to the Qt system palette
 and is used to give the button a more native look-and-feel.
 
 Notice the anchors for the \c Item, \c Button and \c Text types are set using
-\l {qdeclarativeintroduction.html#dot-properties}{group notation} for readability.
+group (dot) notation for readability.
 
 \section2 Adding \c Button and \c Block components
 
@@ -360,7 +360,7 @@ Finally, we'll add a cool-looking particle effect to the blocks when they are de
 
 \snippet tutorials/samegame/samegame4/content/BoomBlock.qml 3
 
-To fully understand this you should read the \l Particles documentation, but it's important to note that \c emitRate is set
+To fully understand this you should read \l {Using the Qt Quick Particle System}, but it's important to note that \c emitRate is set
 to zero so that particles are not emitted normally.
 Also, we extend the \c dying State, which creates a burst of particles by calling the \c burst() method on the particles type. The code for the states now look
 like this:
@@ -419,7 +419,7 @@ Here is the \c saveHighScore() function in \c samegame.js:
 
 First we call \c sendHighScore() (explained in the section below) if it is possible to send the high scores to an online database.
 
-Then, we use the \l{QtQuick.LocalStorage 2}{Local Storage API} to maintain a persistent SQL database unique to this application. We create an offline storage database for the high scores using \c openDatabaseSync() and prepare the data and SQL query that we want to use to save it. The offline storage API uses SQL queries for data manipulation and retrieval, and in the \c db.transaction() call we use three SQL queries to initialize the database (if necessary), and then add to and retrieve high scores. To use the returned data, we turn it into a string with one line per row returned, and show a dialog containing that string.
+Then, we use the \l{QtQuick.LocalStorage}{Local Storage API} to maintain a persistent SQL database unique to this application. We create an offline storage database for the high scores using \c openDatabaseSync() and prepare the data and SQL query that we want to use to save it. The offline storage API uses SQL queries for data manipulation and retrieval, and in the \c db.transaction() call we use three SQL queries to initialize the database (if necessary), and then add to and retrieve high scores. To use the returned data, we turn it into a string with one line per row returned, and show a dialog containing that string.
 
 This is one way of storing and displaying high scores locally, but certainly not the only way. A more complex alternative would be to create a high score dialog component, and pass it the results for processing and display (instead of reusing the \c Dialog). This would allow a more themeable dialog that could better present the high scores. If your QML is the UI for a C++ application, you could also have passed the score to a C++ function to store it locally in a variety of ways, including a simple format without SQL or in another SQL database.
 
@@ -451,9 +451,9 @@ By following this tutorial you've seen how you can write a fully functional appl
 
 \list
 \li Build your application with \l {Qt Quick QML Types}{QML types}
-\li Add application logic \l{Using JavaScript Expressions in QML}{with JavaScript code}
+\li Add application logic \l{JavaScript Expressions in QML Documents}{with JavaScript code}
 \li Add animations with \l {Behavior}{Behaviors} and \l{Qt Quick States}{states}
-\li Store persistent application data using, for example, \l{QtQuick.LocalStorage 2}{QtQuick.LocalStorage} or \l XMLHttpRequest
+\li Store persistent application data using, for example, \l QtQuick.LocalStorage or \l XMLHttpRequest
 \endlist
 
 There is so much more to learn about QML that we haven't been able to cover in this tutorial. Check out all the
diff --git a/src/quick/doc/src/concepts/effects/particles.qdoc b/src/quick/doc/src/concepts/effects/particles.qdoc
index ec49c6df43..c3262b7082 100644
--- a/src/quick/doc/src/concepts/effects/particles.qdoc
+++ b/src/quick/doc/src/concepts/effects/particles.qdoc
@@ -46,7 +46,7 @@
     \page qtquick-effects-particles.html
     \title Using the Qt Quick Particle System
 
-    Documentation for all Particle System types can be found on the \l{QtQuick.Particles 2}{QtQuick.Particles} module page.
+    Documentation for all Particle System types can be found on the \l QtQuick.Particles module page.
 
   Note that to use types from the particles module, you will need to import the types with the following line:
   \code
diff --git a/src/quick/doc/src/concepts/input/focus.qdoc b/src/quick/doc/src/concepts/input/focus.qdoc
index 827f6d85c8..065651c826 100644
--- a/src/quick/doc/src/concepts/input/focus.qdoc
+++ b/src/quick/doc/src/concepts/input/focus.qdoc
@@ -168,7 +168,7 @@ When a QML \l Item explicitly relinquishes focus (by setting its
 system does not automatically select another type to receive focus. That is,
 it is possible for there to be no currently active focus.
 
-See the \l{declarative/keyinteraction/focus}{Keyboard Focus example} for a
+See \l{Qt Quick Examples - Key Interaction} for a
 demonstration of moving keyboard focus between multiple areas using FocusScope
 types.
 
diff --git a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
index 28bbbf1cca..abef6b765b 100644
--- a/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
+++ b/src/quick/doc/src/concepts/modelviewsdata/cppmodels.qdoc
@@ -174,8 +174,8 @@ with list models of QAbstractItemModel type:
 The above examples use QQmlContext::setContextProperty() to set
 model values directly in QML components. An alternative to this is to
 register the C++ model class as a QML type (either
-\l{qtqml-registercpptypes.html}{directly} from a C++ entry-point, or within
-the initialization function of a \l{qtqml-modules-cppplugins.html}
+\l{Defining QML Types from C++}{directly} from a C++ entry-point, or within
+the initialization function of a \l{Creating C++ Plugins for QML}
 {QML C++ plugin}, as shown below).  This would allow the model classes to be
 created directly as types within QML:
 
@@ -215,7 +215,7 @@ ListView {
 
 \endtable
 
-See \l {Tutorial: Extending QML with C++} for details on writing QML C++
+See \l {Writing QML Extensions with C++} for details on writing QML C++
 plugins.
 
 
diff --git a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
index b5dd961ea9..1a539f56ed 100644
--- a/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
+++ b/src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc
@@ -193,8 +193,7 @@ To visualize data, bind the view's \c model property to a model and the
     and \l{qtqml-typesystem-topic.html#qml-object-types}
     {creating QML types} articles.
 
-    The use of positioner items to arrange items from a model is covered in
-    \l{Generating Items with Repeaters}.
+    Positioning of items from a model can be achieved using a \l{Repeater}.
 
     \section2 ListModel
 
diff --git a/src/quick/doc/src/concepts/modelviewsdata/topic.qdoc b/src/quick/doc/src/concepts/modelviewsdata/topic.qdoc
index 6939c3131f..21c81f47e5 100644
--- a/src/quick/doc/src/concepts/modelviewsdata/topic.qdoc
+++ b/src/quick/doc/src/concepts/modelviewsdata/topic.qdoc
@@ -49,7 +49,7 @@ see the page titled \l{qtquick-modelviewsdata-modelview.html}
 
 Databases are commonly used to store information in applications.  Qt Quick
 provides simplified access to relational databases via the
-\l{QtQuick.LocalStorage 2}{Qt Quick local storage module}.
+\l QtQuick.LocalStorage module.
 
 */
 
diff --git a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
index ad8b2f3b63..5d173efedb 100644
--- a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
+++ b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
@@ -89,7 +89,7 @@ views that takes the mirroring into account can be read from the \c effectiveLay
 
 The attached property \l LayoutMirroring is provided as a convenience for easily implementing right-to-left
 support for existing left-to-right Qt Quick applications. It mirrors the behavior of \l {anchor-layout}
-{Item anchors}, the layout direction of \l{Composing User Interfaces with QML#Positioners}{positioners} and
+{Item anchors}, the layout direction of \l{Item Positioners}{positioners} and
 \l{qtquick-modelviewsdata-modelview.html}{model views}, and the explicit text alignment of QML text types.
 
 You can enable layout mirroring for a particular \l Item:
diff --git a/src/quick/doc/src/concepts/positioning/topic.qdoc b/src/quick/doc/src/concepts/positioning/topic.qdoc
index bae6a7f71b..51cb07c51d 100644
--- a/src/quick/doc/src/concepts/positioning/topic.qdoc
+++ b/src/quick/doc/src/concepts/positioning/topic.qdoc
@@ -51,7 +51,7 @@ the position manually than to use the more dynamic positioning methods
 documented in proceeding sections.
 
 In Qt Quick, every visual object is positioned within the
-\l{qtquick-visual-coordinates.html}{coordinate system}
+\l{Concepts - Visual Coordinates in Qt Quick}{coordinate system}
 provided by the Qt Quick visual canvas.  As described in that document, the
 x and y coordinates of a visual object are relative to those of its visual
 parent, with the top-left corner having the coordinate (0, 0).
diff --git a/src/quick/doc/src/concepts/statesanimations/animations.qdoc b/src/quick/doc/src/concepts/statesanimations/animations.qdoc
index 07f1048bf2..e4e208863b 100644
--- a/src/quick/doc/src/concepts/statesanimations/animations.qdoc
+++ b/src/quick/doc/src/concepts/statesanimations/animations.qdoc
@@ -72,7 +72,7 @@ animations provide timing controls and allows different interpolations through
 
 \snippet qml/animation.qml property animation
 
-Specialized \l{qml-property-animation-types}{property animation types}
+Specialized property animation types
 have more efficient implementations than the \l{PropertyAnimation} type. They
 are for setting animations to different QML types such as \c int, \c color, and
 rotations. Similarly, the \l{ParentAnimation} can animate parent changes.
@@ -145,8 +145,7 @@ values.
 abrupt property changes; animations smooth transitions to produce visually
 appealing state changes.
 
-The \l{Transition} type can contain
-\l{qml-animation-types}{animation types} to interpolate property changes
+The \l{Transition} type can contain animation types to interpolate property changes
 caused by state changes. To assign the transition to an object, bind it to the
 \c transitions property.
 
diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc
index ddca973496..4cb1d8ddd4 100644
--- a/src/quick/doc/src/examples.qdoc
+++ b/src/quick/doc/src/examples.qdoc
@@ -44,8 +44,8 @@ To run the sample applications, open them in Qt Creator or use the included
 
 \annotatedlist{qtquickdemos}
 
-Some of these code samples below  have a corresponding \l{qtquick-tutorials}{tutorial}.
-The Qt Quick features are covered in the \l {qtquick-overviews}{main page}.
+Some of these code samples below  have a corresponding tutorial.
+The Qt Quick features are covered in the \l {Qt Quick}{main page}.
 This set of code samples are part of the collection of \l{Qt Examples}.
 
 \annotatedlist{qtquickexamples}
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index 0155ee4e2d..dda06d31e1 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -85,7 +85,7 @@ In addition, the \c QtQuick module provides the following basic types:
 \section1 Object Types
 
 All of the object types provided by \c QtQuick are based on the \l{Item} type,
-which itself derives from \l{QtQml::QtObject}{QtObject}.  \l{qtqml-typereference-topic.html#object-types}
+which itself derives from \l{QtQml::QtObject}{QtObject}.  \l{Qt QML QML Types#Object Types}
 {QML object types} provided by the Qt QML module
 (such as \l{QtQml::QtObject}{QtObject} and \l{QtQml::Component}{Component}) are also available when
 you import \c QtQuick.
@@ -269,7 +269,7 @@ Views
 \list
 \li \l {ListView} - Provides a list visualization of a model
 \li \l {GridView} - Provides a grid visualization of a model
-\li \l {PathView} - Visualizes a model's contents along a path. See \l {Path Definition}{Path Elements} for more information.
+\li \l {PathView} - Visualizes a model's contents along a path. See \l Path for more information.
 \li \l {Package} - Collection that enables sharing of items within different views
 \endlist
 
diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc
index a4428c5818..e0c05b16a8 100644
--- a/src/quick/doc/src/tutorial.qdoc
+++ b/src/quick/doc/src/tutorial.qdoc
@@ -96,7 +96,7 @@ The \c y property is used to position the text vertically at 30 pixels from the
 The \c anchors.horizontalCenter property refers to the horizontal center of an type.
 In this case, we specify that our text type should be horizontally centered in the \e page element (see \l{anchor-layout}{Anchor-Based Layout}).
 
-The \c font.pointSize and \c font.bold properties are related to fonts and use the \l{dot properties}{dot notation}.
+The \c font.pointSize and \c font.bold properties are related to fonts and use the dot notation.
 
 
 \section2 Viewing the example
@@ -124,7 +124,7 @@ Our color picker is made of six cells with different colors.
 To avoid writing the same code multiple times for each cell, we create a new \c Cell component.
 A component provides a way of defining a new type that we can re-use in other QML files.
 A QML component is like a black-box and interacts with the outside world through properties, signals and functions and is generally
-defined in its own QML file. (For more details, see \l {Defining New Components}).
+defined in its own QML file. (For more details, see the \l Component documentation).
 The component's filename must always start with a capital letter.
 
 Here is the QML code for \c Cell.qml:
@@ -145,7 +145,7 @@ An \l Item is the most basic visual type in QML and is often used as a container
 We declare a \c cellColor property. This property is accessible from  \e outside our component, this allows us
 to instantiate the cells with different colors.
 This property is just an alias to an existing property - the color of the rectangle that compose the cell
-(see \l{Property Binding in QML}).
+(see \l{Property Binding}).
 
 \snippet tutorials/helloworld/Cell.qml 5
 
diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc
index 26d88699bc..16df2a6d0d 100644
--- a/src/quick/doc/src/whatsnew.qdoc
+++ b/src/quick/doc/src/whatsnew.qdoc
@@ -431,24 +431,23 @@ to \l {Qt Quick}{Qt Quick 2}; the other functions are all new in \l {Qt Quick}{Q
 \section2 QtQuick.Particles
 
 This new module provides particle system support for creating a variety of 2D particle systems. See
-the \l{QtQuick.Particles 2}{QtQuick.Particles} documentation for comprehensive details.
+the \l QtQuick.Particles documentation for comprehensive details.
 
 This obsoletes the experimental \c Qt.labs.particles module.
 
 \section2 QtQuick.Window
 
 This new module contains the \l Window type for creating a basic window and the \l Screen type for
-accessing a screen's resolution and other details. See the \l{QtQuick.Window 2}{QtQuick.Window}
+accessing a screen's resolution and other details. See the \l QtQuick.Window
 documentation for comprehensive details.
 
 \section2 QtQuick.XmlListModel
 
 This new module contains XmlListModel and associated types, which were previously in the \c QtQuick
-module. See the \l{QtQuick.XmlListModel 2}{QtQuick.XmlListModel} documentation for details.
+module. See the \l QtQuick.XmlListModel documentation for details.
 
 \section2 QtQuick.LocalStorage
 
 This new module provides access to the SQL Local Storage API that was previously accessible from the
-\l {QML Global Object}. See the \l{QtQuick.LocalStorage 2}{QtQuick.LocalStorage} documentation for details.
-
+\l {QML Global Object}. See the \l QtQuick.LocalStorage documentation for details.
 */