From 714145e7017afb74a23548ee9df2eff30536cfde Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Tue, 7 Nov 2017 10:55:07 -0200 Subject: 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 Reviewed-by: Oliver Wolff Reviewed-by: Paolo Angelelli --- src/location/configure.json | 2 +- src/location/doc/src/plugins/mapboxgl.qdoc | 2 +- src/plugins/geoservices/mapboxgl/mapboxgl.pro | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/location/configure.json b/src/location/configure.json index 3337b074..4de6e865 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 9099fb39..6593a9e3 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 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) -- cgit v1.2.1