diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:06 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:49:06 +0100 |
| commit | 485a631f2ae06e3328176049c51053e3047448bb (patch) | |
| tree | 76ed7ca62abd4e9bdd24ba779df7c5c00609a028 /src/plugins/geoservices/mapboxgl/mapboxgl.pro | |
| parent | 361a72a861a213a7bc735fbce7c3433a2f6a08cc (diff) | |
| parent | afc51951769ac7320a98a973bcb95a12bc970019 (diff) | |
| download | qtlocation-485a631f2ae06e3328176049c51053e3047448bb.tar.gz | |
Merge 5.10 into 5.10.0
Change-Id: I81af4fc4e6dcc204b3657ec321820d6c7109e336
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 |