diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 13:14:00 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-11-02 13:14:06 +0100 |
| commit | 1c0b494ae0d780230e2ed410ef74353dc1a2ea77 (patch) | |
| tree | dedac7c676ebd9dafdfc2879e5a330e4f69ba367 /src/location/doc | |
| parent | 315b4325d0b55d1104d1615fa6f7ecc12465f8f2 (diff) | |
| parent | 16423f84f970d7dac644a4b041e3ebe2ac0f6e22 (diff) | |
| download | qtlocation-1c0b494ae0d780230e2ed410ef74353dc1a2ea77.tar.gz | |
Merge remote-tracking branch 'gerrit/5.7' into 5.8
Conflicts:
tests/auto/declarative_ui/BLACKLIST
Change-Id: I0f6c9228c899c4d1d55fffc596c661ee0f6c2b66
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 d402307f..c0ae48a7 100644 --- a/src/location/doc/src/plugins/osm.qdoc +++ b/src/location/doc/src/plugins/osm.qdoc @@ -101,8 +101,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 |