diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:09:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:09:41 +0100 |
| commit | afc51951769ac7320a98a973bcb95a12bc970019 (patch) | |
| tree | f248c33d4a98b2baa047cf8453dd91d6e6545cc8 /src/plugins/geoservices/mapboxgl/mapboxgl.pro | |
| parent | 5804d34e3b311dc814c7897894ef7a6b960f0f40 (diff) | |
| parent | 8c42dba3910c0bec3134f57bd5fa466df72d7ba7 (diff) | |
| download | qtlocation-afc51951769ac7320a98a973bcb95a12bc970019.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Id7d47d95c8dc6a696b79812573e50c572593123e
Diffstat (limited to 'src/plugins/geoservices/mapboxgl/mapboxgl.pro')
| -rw-r--r-- | src/plugins/geoservices/mapboxgl/mapboxgl.pro | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/plugins/geoservices/mapboxgl/mapboxgl.pro b/src/plugins/geoservices/mapboxgl/mapboxgl.pro index f35f26dc..17b6f53a 100644 --- a/src/plugins/geoservices/mapboxgl/mapboxgl.pro +++ b/src/plugins/geoservices/mapboxgl/mapboxgl.pro @@ -35,16 +35,7 @@ load(qt_build_paths) LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqmapboxgl$$qtPlatformTargetSuffix() qtConfig(icu) { - include(../../../3rdparty/icu_dependency.pri) -} - -# 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} + QMAKE_USE_PRIVATE += icu } PLUGIN_TYPE = geoservices |