diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 11:06:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 11:06:28 +0200 |
| commit | f55629245259ba7364e258f92408823024423caa (patch) | |
| tree | f73063cf02dc175fbe9f0bfb48b3ddd686ea0f72 /src/location/declarativemaps/qdeclarativegeoroutemodel.cpp | |
| parent | 22d980c8124026eb712f563326d5a5c1b180c671 (diff) | |
| parent | d89701c5c8646dedb0ebb2e011c4da796a6ae8a1 (diff) | |
| download | qtlocation-f55629245259ba7364e258f92408823024423caa.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/plugins/geoservices/geoservices.pro
Change-Id: Ie82dd22c588e5cba409fc1ef31a65968ce9f719b
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeoroutemodel.cpp')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeoroutemodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp index 8787271e..94bd63c8 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp @@ -36,7 +36,7 @@ #include "qdeclarativegeoroutemodel_p.h" #include "qdeclarativegeoroute_p.h" -#include "error_messages.h" +#include "error_messages_p.h" #include "locationvaluetypehelper_p.h" #include <QtCore/QCoreApplication> @@ -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 @@ -764,7 +764,7 @@ void QDeclarativeGeoRouteQuery::setNumberAlternativeRoutes(int numberAlternative } /*! - \qmlproperty QJSValue RouteQuery::waypoints + \qmlproperty list<coordinate> RouteQuery::waypoints The waypoint coordinates of the desired route. |