From e78a5ab5cf4d932aea0503ac5684a95a235db8b1 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Mon, 13 Nov 2017 12:28:31 +0100 Subject: Add plugin dependencies to the mapviewer examples This is a workaround for QTBUG-38735. Task-number: QTBUG-58589 Change-Id: I8e9031657d04f192b64581ea060dfc91bce3fada Reviewed-by: Oswald Buddenhagen Reviewed-by: Alex Blasche --- examples/location/mapviewer/mapviewer.pro | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro index 90d85e62..d49258a2 100644 --- a/examples/location/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro @@ -5,6 +5,11 @@ QT += qml network quick positioning location CONFIG += qtquickcompiler SOURCES += main.cpp +# Workaround for QTBUG-38735 +QT_FOR_CONFIG += location-private +qtConfig(geoservices_mapboxgl): QT += sql opengl +qtConfig(geoservices_osm): QT += concurrent + RESOURCES += \ mapviewer.qrc -- cgit v1.2.1 From 3f06c2dad7c90771df3ea98435097bda9c08cbeb Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Mon, 31 Jul 2017 13:04:48 +0200 Subject: Make QGeoMapParameter accessors virtual So that it's possible to make the type property somehow constant in subclasses Change-Id: I61f4d1b412dbfb173e7ca7fa31411cffbfcfacb1 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/location/maps/qgeomapparameter_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); -- cgit v1.2.1 From cd24931b171f73d6ba71450493e9d5a8142a67a5 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Tue, 21 Nov 2017 13:30:47 +0100 Subject: Enforce numberAlternativeRoutes where possible when doing route requests Change-Id: I321e802d795df36d8cdd1b8578e77094c500cc2e Reviewed-by: Alex Blasche --- src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp | 2 +- src/plugins/geoservices/osm/qgeoroutereplyosm.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 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/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 { -- cgit v1.2.1 From 8552cf9d96d96dc500743dfbc117f0634cab0590 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Mon, 20 Nov 2017 19:28:39 +0200 Subject: Remove OpenGL ES limitation for Mapbox GL on Windows Also fixes an issue preventing GL native from working on MinGW. mapbox-gl-native @ 8757164ac8f2b033b2b12d4baf075ed18cfeb2b4 Task-number: QTBUG-64632 Change-Id: Iab9a560adcd54194cd9829a326b325856f8c8cc2 Reviewed-by: Paolo Angelelli --- src/3rdparty/mapbox-gl-native | 2 +- .../geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native index 572822c8..8c1be4ec 160000 --- a/src/3rdparty/mapbox-gl-native +++ b/src/3rdparty/mapbox-gl-native @@ -1 +1 @@ -Subproject commit 572822c8ca15be190b43afbf7f91d132e988bf21 +Subproject commit 8c1be4ec01ef46bf453856531ebf53b48ce3dbe7 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); } -- cgit v1.2.1 From 730b2bd96e88fe63364c9f81e299555f0b1f0daa Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 12 Dec 2017 09:54:45 +0100 Subject: Bump version Change-Id: Ia4824b42098da920721eaeaff0f370f8ebf6cdbc --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 33ba37ba..08c80d36 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.9.3 +MODULE_VERSION = 5.9.4 -- cgit v1.2.1