diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-11-07 10:55:07 -0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-11-08 10:47:20 +0000 |
| commit | 714145e7017afb74a23548ee9df2eff30536cfde (patch) | |
| tree | fb80de6706ba2a7a0ef3750873bab5f148a1abe2 /src/plugins/geoservices | |
| parent | af2ea98b9a7555acf4d0d9c08a2edd489b613e72 (diff) | |
| download | qtlocation-714145e7017afb74a23548ee9df2eff30536cfde.tar.gz | |
Fix Mapbox GL plugin OpenGL usage
Previously we were linking directly with the OpenGL library available
in the system. On Windows for instance the only option was ANGLE.
Now Mapbox GL is using OpenGL through QOpenGLFunctions and shall
offer much better compatibility.
Task-number: QTBUG-62108
Task-number: QTBUG-61767
Task-number: QTBUG-60897
Change-Id: Iabd29ff6c0b6daf14373508d4847344c07d01a57
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/plugins/geoservices')
| -rw-r--r-- | src/plugins/geoservices/mapboxgl/mapboxgl.pro | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/plugins/geoservices/mapboxgl/mapboxgl.pro b/src/plugins/geoservices/mapboxgl/mapboxgl.pro index 2cecb820..17b6f53a 100644 --- a/src/plugins/geoservices/mapboxgl/mapboxgl.pro +++ b/src/plugins/geoservices/mapboxgl/mapboxgl.pro @@ -38,15 +38,6 @@ qtConfig(icu) { QMAKE_USE_PRIVATE += icu } -# When building for Windows with dynamic OpenGL, this plugin -# can only run with ANGLE because Mapbox GL requires at least -# OpenGL ES and does not use QOpenGLFunctions for resolving -# the OpenGL symbols. -lopengl32 only gives OpenGL 1.1. -win32:qtConfig(dynamicgl) { - qtConfig(combined-angle-lib): LIBS_PRIVATE += -l$${LIBQTANGLE_NAME} - else: LIBS_PRIVATE += -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -} - PLUGIN_TYPE = geoservices PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryMapboxGL load(qt_plugin) |