summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-05-23 17:12:57 +0200
committerLiang Qi <liang.qi@qt.io>2017-05-23 17:13:07 +0200
commit88f6c2fe36ebcf99f6928b7fd6e94c61840aa95e (patch)
treeb635886944904753a47db9f3836f0c7aada34a7d /src/plugins/geoservices
parentff5e2618d98cc547ebb2e4ff24e2ab5bb97f8168 (diff)
parent888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f (diff)
downloadqtlocation-88f6c2fe36ebcf99f6928b7fd6e94c61840aa95e.tar.gz
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: I122bd675639baca961882ec9d512900f4e7e773b
Diffstat (limited to 'src/plugins/geoservices')
-rw-r--r--src/plugins/geoservices/mapboxgl/mapboxgl.pro3
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