summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-04-18 22:00:13 +0200
committerLiang Qi <liang.qi@qt.io>2017-04-18 22:00:13 +0200
commitc8a4d90780a76a9c4719b0ad5ac073bc3c4300f0 (patch)
tree299a5c6e94e5aab8686bfbf9396e483c02ea2565 /src
parent453fab84c606328811bafd4de9cde5564620fdc6 (diff)
parent0023c72390d7055a1446f8fb38e0415be134f501 (diff)
downloadqtlocation-c8a4d90780a76a9c4719b0ad5ac073bc3c4300f0.tar.gz
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I8ce0a0994d57fb077be4b6771f219bfc4134aa22
Diffstat (limited to 'src')
-rw-r--r--src/location/declarativemaps/qdeclarativegeoroutemodel.cpp2
-rw-r--r--src/location/doc/src/qml-maps.qdoc4
2 files changed, 3 insertions, 3 deletions
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.