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/mapboxgl/qgeoserviceproviderpluginmapboxgl.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/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp')
| -rw-r--r-- | src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
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); } |