diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-05-15 08:06:08 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2017-05-19 07:36:41 +0000 |
| commit | 87681b757206a4c18a72cfa8c92d10c1a09d4af3 (patch) | |
| tree | 6a2a27dc215ece8ce35140b0269b9a713a4a934a | |
| parent | 3f58030b244aef6819d34b02b3a2aad926d21e05 (diff) | |
| download | qtlocation-87681b757206a4c18a72cfa8c92d10c1a09d4af3.tar.gz | |
mapboxgl: Fix dynamic opengl build
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 <Friedemann.Kleint@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| -rw-r--r-- | src/plugins/geoservices/mapboxgl/mapboxgl.pro | 3 |
1 files changed, 2 insertions, 1 deletions
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 |