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 | |
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')
5 files changed, 4 insertions, 13 deletions
diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native -Subproject 572822c8ca15be190b43afbf7f91d132e988bf2 +Subproject 8c1be4ec01ef46bf453856531ebf53b48ce3dbe diff --git a/src/location/maps/qgeomapparameter_p.h b/src/location/maps/qgeomapparameter_p.h index bc39c14a..7f27e8b5 100644 --- a/src/location/maps/qgeomapparameter_p.h +++ b/src/location/maps/qgeomapparameter_p.h @@ -64,8 +64,8 @@ public: explicit QGeoMapParameter(QObject *parent = 0); virtual ~QGeoMapParameter(); - QString type() const; - void setType(const QString &type); + virtual QString type() const; + virtual void setType(const QString &type); void updateProperty(const char *propertyName, QVariant value); diff --git a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp index 8fc3386a..3099657b 100644 --- a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp +++ b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp @@ -188,7 +188,7 @@ void QGeoRouteReplyMapbox::networkReplyFinished() QList<QGeoRoute> list; QJsonArray routes = object.value(QStringLiteral("routes")).toArray(); - for (int i = 0; i < routes.count(); i++) { + for (int i = 0; i < qMin(routes.count(), request().numberAlternativeRoutes() + 1); i++) { QGeoRoute route = constructRoute(routes.at(i).toObject()); list.append(route); } diff --git a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp index c7d5d3ee..dd25c99e 100644 --- a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp +++ b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp @@ -65,15 +65,6 @@ QGeoCodingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createGeocodingMana QGeoMappingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createMappingManagerEngine( const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) const { -#ifdef Q_OS_WIN - if (QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGLES) { - qWarning("The Mapbox GL plugin only supports OpenGL ES on Windows. \ - Try setting the environment variable QT_OPENGL to 'angle'."); - - return 0; - } -#endif - return new QGeoMappingManagerEngineMapboxGL(parameters, error, errorString); } 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 { |