diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-12-15 14:53:51 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-12-15 14:53:51 +0100 |
| commit | 337aea7bc386d5e97825d27335d860fc88b2bee3 (patch) | |
| tree | 76d316a935755a922e6b7b998867c7cba90f0a94 /src/plugins/geoservices/osm/qgeoroutereplyosm.cpp | |
| parent | 57f42a11363cb61892937caa904c3f5c660cabeb (diff) | |
| parent | 730b2bd96e88fe63364c9f81e299555f0b1f0daa (diff) | |
| download | qtlocation-337aea7bc386d5e97825d27335d860fc88b2bee3.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I8300f5fcbbe3064049e11d2b04c10e35c9945c8d
Diffstat (limited to 'src/plugins/geoservices/osm/qgeoroutereplyosm.cpp')
| -rw-r--r-- | src/plugins/geoservices/osm/qgeoroutereplyosm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp index 6924fda7..732e8d72 100644 --- a/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeoroutereplyosm.cpp @@ -77,7 +77,7 @@ void QGeoRouteReplyOsm::networkReplyFinished() QGeoRouteReply::Error error = parser->parseReply(routes, errorString, reply->readAll()); if (error == QGeoRouteReply::NoError) { - setRoutes(routes.mid(0,1)); // TODO QTBUG-56426 + setRoutes(routes.mid(0, request().numberAlternativeRoutes() + 1)); // setError(QGeoRouteReply::NoError, status); // can't do this, or NoError is emitted and does damages setFinished(true); } else { |