summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2017-11-07 12:55:07 (GMT)
committerPaolo Angelelli <paolo.angelelli@qt.io>2017-11-08 10:47:20 (GMT)
commit714145e7017afb74a23548ee9df2eff30536cfde (patch)
treefb80de6706ba2a7a0ef3750873bab5f148a1abe2
parentaf2ea98b9a7555acf4d0d9c08a2edd489b613e72 (diff)
downloadqtlocation-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>
-rw-r--r--src/location/configure.json2
-rw-r--r--src/location/doc/src/plugins/mapboxgl.qdoc2
-rw-r--r--src/plugins/geoservices/mapboxgl/mapboxgl.pro9
3 files changed, 2 insertions, 11 deletions
diff --git a/src/location/configure.json b/src/location/configure.json
index 3337b07..4de6e86 100644
--- a/src/location/configure.json
+++ b/src/location/configure.json
@@ -37,7 +37,7 @@
"condition": [
"features.opengl",
"features.c++14",
- "!config.qnx && (!config.win32 || (config.mingw && features.angle))"
+ "!config.qnx && (!config.win32 || config.mingw)"
],
"output": [ "privateFeature" ]
},
diff --git a/src/location/doc/src/plugins/mapboxgl.qdoc b/src/location/doc/src/plugins/mapboxgl.qdoc
index 9099fb3..6593a9e 100644
--- a/src/location/doc/src/plugins/mapboxgl.qdoc
+++ b/src/location/doc/src/plugins/mapboxgl.qdoc
@@ -60,7 +60,7 @@ and tiles hosted by Mapbox. To create a Mapbox account visit \l{https://www.mapb
Qt Location Mapbox GL Plugin has the following support for platforms:
\list
- \li Microsoft Windows (win32) - Supported, requires MinGW 5.0+ and ANGLE as OpenGL backend
+ \li Microsoft Windows (win32) - Supported, requires MinGW 5.0+
\li Linux X11 - Supported, requires GCC 4.9+
\li macOS - Supported
\li Android - Supported
diff --git a/src/plugins/geoservices/mapboxgl/mapboxgl.pro b/src/plugins/geoservices/mapboxgl/mapboxgl.pro
index 2cecb82..17b6f53 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)