diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:00:13 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:00:13 +0200 |
| commit | c8a4d90780a76a9c4719b0ad5ac073bc3c4300f0 (patch) | |
| tree | 299a5c6e94e5aab8686bfbf9396e483c02ea2565 /examples/location | |
| parent | 453fab84c606328811bafd4de9cde5564620fdc6 (diff) | |
| parent | 0023c72390d7055a1446f8fb38e0415be134f501 (diff) | |
| download | qtlocation-c8a4d90780a76a9c4719b0ad5ac073bc3c4300f0.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I8ce0a0994d57fb077be4b6771f219bfc4134aa22
Diffstat (limited to 'examples/location')
| -rw-r--r-- | examples/location/mapviewer/doc/src/mapviewer.qdoc | 4 | ||||
| -rw-r--r-- | examples/location/mapviewer/mapviewer.pro | 1 |
2 files changed, 3 insertions, 2 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 += \ |