summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2017-11-20 17:28:39 (GMT)
committerPaolo Angelelli <paolo.angelelli@qt.io>2017-11-30 10:21:05 (GMT)
commit8552cf9d96d96dc500743dfbc117f0634cab0590 (patch)
treea62776e63d93a37faf12bb7836a89d73191c12ba
parentcd24931b171f73d6ba71450493e9d5a8142a67a5 (diff)
downloadqtlocation-8552cf9d96d96dc500743dfbc117f0634cab0590.tar.gz
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 <paolo.angelelli@qt.io>
m---------src/3rdparty/mapbox-gl-native0
-rw-r--r--src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp9
2 files changed, 0 insertions, 9 deletions
diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native
-Subproject 572822c8ca15be190b43afbf7f91d132e988bf2
+Subproject 8c1be4ec01ef46bf453856531ebf53b48ce3dbe
diff --git a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
index c7d5d3e..dd25c99 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 &parameters, 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);
}