diff options
| author | Nico Vertriest <nico.vertriest@qt.io> | 2017-03-13 14:34:58 +0100 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@qt.io> | 2017-03-14 11:15:26 +0000 |
| commit | 06c473d9dfe162a1e55a1ebbc68ff89f4cd9a8ea (patch) | |
| tree | e8ab658724f1c766622b1b39d9ce563879d986bb | |
| parent | 31ff679359172dfa068014ab0537418f5b852eac (diff) | |
| download | qtlocation-06c473d9dfe162a1e55a1ebbc68ff89f4cd9a8ea.tar.gz | |
Doc: corrected link to Models and Views in Qt Quick
Change-Id: I8a6e6a34ea22b5ba96b46f05e970cdaa91dbc6b4
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| -rw-r--r-- | examples/location/mapviewer/doc/src/mapviewer.qdoc | 4 | ||||
| -rw-r--r-- | src/imports/location/qdeclarativegeoroutemodel.cpp | 2 | ||||
| -rw-r--r-- | src/location/doc/src/qml-maps.qdoc | 4 |
3 files changed, 5 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/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index 0c64c23a..25c43356 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/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. |