diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 10:53:45 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 10:53:56 +0100 |
| commit | 16423f84f970d7dac644a4b041e3ebe2ac0f6e22 (patch) | |
| tree | 40e88861e7987c5286012185303205113aa4ca3c /src/location/doc | |
| parent | 3f813d1c8c24e5da67d3f096eb3f5c73e760e641 (diff) | |
| parent | 09868ace97177fbeb7198a844113f47065102b1b (diff) | |
| download | qtlocation-16423f84f970d7dac644a4b041e3ebe2ac0f6e22.tar.gz | |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/location/maps/maps.pri
Change-Id: I346d7351e98f4a1aa67c9c0401d41b6da9099f48
Diffstat (limited to 'src/location/doc')
| -rw-r--r-- | src/location/doc/src/plugins/osm.qdoc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/location/doc/src/plugins/osm.qdoc b/src/location/doc/src/plugins/osm.qdoc index 1960fae9..a0f2bc2b 100644 --- a/src/location/doc/src/plugins/osm.qdoc +++ b/src/location/doc/src/plugins/osm.qdoc @@ -94,8 +94,14 @@ a prefix. \row \li osm.routing.host \li Url string set when making network requests to the routing server. This parameter should be set to a - valid server url with the correct osrm API. If not specified the default \l {http://router.project-osrm.org/viaroute}{url} will be used. + valid server url with the correct osrm API. If not specified the default \l {http://router.project-osrm.org/route/v1/driving/}{url} will be used. \note The API documentation and sources are available at \l {http://project-osrm.org/}{Project OSRM}. + +\row + \li osm.routing.apiversion + \li String defining the api version of the (custom) OSRM server. Valid values are \b{v4} and \b{v5}. The default is \b{v5}. + This parameter should be set only if \tt{osm.routing.host} is set, and is an OSRM v4 server. + \row \li osm.geocoding.host \li Url string set when making network requests to the geocoding server. This parameter should be set to a |