Inter-module documentation link fixes.

Set the depends variable in qtlocation.qdocconf to read index files
from qtcore, qtnetwork, qtqml and qtquick so that links to documentation
in those modules are correctly generated.

Fix up remaining broken links even with the above.

Change-Id: Ided2b04423088a05c5f2bdf148972e15148dc80a
Reviewed-by: Alex <alex.blasche@nokia.com>

3 files changed, 12 insertions, 9 deletions

diff --git a/doc/config/qtlocation.qdocconf b/doc/config/qtlocation.qdocconf
index b07f3d85..d551db17 100644
--- a/doc/config/qtlocation.qdocconf
+++ b/doc/config/qtlocation.qdocconf
@@ -6,6 +6,8 @@ include(qt-defines.qdocconf)
 project = Qt Location
 description = Qt Location Documentation
 
+depends += qtcore qtnetwork qtquick qtqml
+
 # Directories in which to search for files to document and images.
 # By default set to the root directory of the project for sources
 # and headers and qdoc will therefore generate output for each file.
diff --git a/doc/src/examples/declarative-mapviewer.qdoc b/doc/src/examples/declarative-mapviewer.qdoc
index 66ed6cf9..c234b5f6 100644
--- a/doc/src/examples/declarative-mapviewer.qdoc
+++ b/doc/src/examples/declarative-mapviewer.qdoc
@@ -178,8 +178,9 @@
     also useful to be able to retrieve the written directions and explanation
     of the travel route. In the example, these are displayed in the pull-out
     on the left-hand side of the map. To create this pull-out's contents, we
-    use a standard \l{ListModel} / \l{ListView} pair. The data in the
-    ListModel is built from the routeModel's output:
+    use a standard \l {Models and Views in Qt Quick#ListModel}{ListModel} and
+    \l {ListView} pair. The data in the \l {Models and Views in Qt Quick#ListModel}{ListModel} is
+    built from the routeModel's output:
 
     \snippet examples/declarative/mapviewer/content/map/MapComponent.qml routeinfomodel
 
diff --git a/doc/src/qml-maps.qdoc b/doc/src/qml-maps.qdoc
index bf928e5c..ff8948db 100644
--- a/doc/src/qml-maps.qdoc
+++ b/doc/src/qml-maps.qdoc
@@ -142,8 +142,8 @@ The \l RouteQuery properties can include
 
 In the following example a default RouteQuery is declared, later to be defined
 by some user input, and used in \c routeModel as the query. The \c routeInfoModel
-is a \l ListModel that can be updated using an \c update() function that we will
-look at later.
+is a \l {Models and Views in Qt Quick#ListModel}{ListModel} that can be updated using an
+\c update() function that we will look at later.
 
 \snippet examples/declarative/mapviewer/content/map/MapComponent.qml routemodel0
 \codeline
@@ -165,11 +165,11 @@ this trip.
 \snippet examples/declarative/mapviewer/mapviewer.qml routerequest1
 \snippet examples/declarative/mapviewer/mapviewer.qml routedialog1
 
-The \c routeInfoModel \l ListModel is used to grab the results of the query and construct
-a suitable list for display. The ListModel \c routeInfoModel contains an
-\c update() function that loops through the segments extracting the segment
-length, instruction text and distance to the next instruction. The extracted
-data is formatted for display as it is retrieved.
+The \c routeInfoModel \l {Models and Views in Qt Quick#ListModel}{ListModel} is used to grab the
+results of the query and construct a suitable list for display.  The
+\l {Models and Views in Qt Quick#ListModel}{ListModel} \c routeInfoModel contains an \c update()
+function that loops through the segments extracting the segment length, instruction text and
+distance to the next instruction.  The extracted data is formatted for display as it is retrieved.
 
 \snippet examples/declarative/mapviewer/content/map/MapComponent.qml routeinfomodel
 \codeline