Merge remote-tracking branch 'origin/5.8' into 5.9

Change-Id: I8ce0a0994d57fb077be4b6771f219bfc4134aa22

4 files changed, 6 insertions, 5 deletions

diff --git a/examples/location/mapviewer/doc/src/mapviewer.qdoc b/examples/location/mapviewer/doc/src/mapviewer.qdoc
index 1fe0411c..2836ae0e 100644
--- a/examples/location/mapviewer/doc/src/mapviewer.qdoc
+++ b/examples/location/mapviewer/doc/src/mapviewer.qdoc
@@ -155,8 +155,8 @@
     This is all that is required to display a Route on the Map. However, it is
     also useful to be able to retrieve the written directions and explanation
     of the travel route. In the example, these are displayed in a \l {ListView} element.
-    To create this content, we 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
+    To create this content, we use a standard \l {Models and Views in Qt Quick#Models}{ListModel} and
+    \l {ListView} pair. The data in the \l {Models and Views in Qt Quick#Models}{ListModel} is
     built from the routeModel's output:
 
     \snippet mapviewer/forms/RouteList.qml routeinfomodel0
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro
index 0dc4a705..90d85e62 100644
--- a/examples/location/mapviewer/mapviewer.pro
+++ b/examples/location/mapviewer/mapviewer.pro
@@ -2,6 +2,7 @@ TARGET = qml_location_mapviewer
 TEMPLATE = app
 
 QT += qml network quick positioning location
+CONFIG += qtquickcompiler
 SOURCES += main.cpp
 
 RESOURCES += \
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
index 8787271e..135323e6 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
     geographic routes from a backend provider. Routes include data about driving
     directions between two points, walking directions with multiple waypoints,
     and various other similar concepts. It functions much like other Model
-    types in QML (see for example \l {Models and Views in Qt Quick#ListModel}{ListModel} and
+    types in QML (see for example \l {Models and Views in Qt Quick#Models}{ListModel} and
     \l XmlListModel), and interacts with views such as \l MapItemView, and \l{ListView}.
 
     Like \l Map and \l GeocodeModel, all the data for a RouteModel to work comes
diff --git a/src/location/doc/src/qml-maps.qdoc b/src/location/doc/src/qml-maps.qdoc
index ecc21672..72cf6ee9 100644
--- a/src/location/doc/src/qml-maps.qdoc
+++ b/src/location/doc/src/qml-maps.qdoc
@@ -177,13 +177,13 @@ this trip.
 \snippet mapviewer/map/MapComponent.qml routerequest0
 \snippet mapviewer/map/MapComponent.qml routerequest1
 
-The \c routeInfoModel \l {Models and Views in Qt Quick#ListModel}{ListModel} is used to grab the
+The \c routeInfoModel \l {Models and Views in Qt Quick#Models}{ListModel} is used to grab the
 results of the query and construct a suitable list for display.
 \snippet mapviewer/forms/RouteList.qml routeinfomodel0
 \snippet mapviewer/forms/RouteList.qml routeinfomodel1
 \snippet mapviewer/forms/RouteList.qml routeinfomodel3
 
-The \l {Models and Views in Qt Quick#ListModel}{ListModel} \c routeInfoModel can be filled
+The \l {Models and Views in Qt Quick#Models}{ListModel} \c routeInfoModel can be filled
 with values using a code, 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.