From 87681b757206a4c18a72cfa8c92d10c1a09d4af3 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 15 May 2017 08:06:08 +0200 Subject: mapboxgl: Fix dynamic opengl build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The default in Qt was changed back to ANGLE being split into libEGL and libGLESv2. mapboxgl now supports both both configurations - having two libraries and combining them into QtANGLE. Task-number: QTBUG-60795 Change-Id: Id3297ed295b20872bc0693b8cd3596a03e739b98 Reviewed-by: Friedemann Kleint Reviewed-by: Oswald Buddenhagen Reviewed-by: Jan Arve Sæther --- src/plugins/geoservices/mapboxgl/mapboxgl.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/geoservices') diff --git a/src/plugins/geoservices/mapboxgl/mapboxgl.pro b/src/plugins/geoservices/mapboxgl/mapboxgl.pro index 7781fd6d..f35f26dc 100644 --- a/src/plugins/geoservices/mapboxgl/mapboxgl.pro +++ b/src/plugins/geoservices/mapboxgl/mapboxgl.pro @@ -43,7 +43,8 @@ qtConfig(icu) { # OpenGL ES and does not use QOpenGLFunctions for resolving # the OpenGL symbols. -lopengl32 only gives OpenGL 1.1. win32:qtConfig(dynamicgl) { - LIBS_PRIVATE += -lQtANGLE + qtConfig(combined-angle-lib): LIBS_PRIVATE += -l$${LIBQTANGLE_NAME} + else: LIBS_PRIVATE += -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} } PLUGIN_TYPE = geoservices -- cgit v1.2.1