diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-10-09 17:51:21 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-11-03 09:53:28 +0000 |
| commit | b187e609c152509c30e863ac4662d9a606a53865 (patch) | |
| tree | e77b7740d549995147104b7f06885534636bcac6 | |
| parent | 467bcda16b0589a75d6b81d4b475a90cecae129d (diff) | |
| download | qtlocation-b187e609c152509c30e863ac4662d9a606a53865.tar.gz | |
Fix ICU linkage on the Mapbox GL plugin
This makes both the Mapbox GL plugin and the Mapbox GL engine at
src/3rdparty/mapbox-gl-native use ICU in the same way as qtbase.
QMAKE_USE_PRIVATE += icu
This should fix build errors when using an ICU that doesn't have
headers installed on the default header lookup path. That assumption
was specially true for the Mapbox GL engine 3rdparty submodule.
Task-number: QTBUG-63571
Change-Id: Id0ab4cb8fb42b8eda8afb9650cd678ee7c5c45ad
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| -rw-r--r-- | src/3rdparty/icu_dependency.pri | 13 | ||||
| m--------- | src/3rdparty/mapbox-gl-native | 0 | ||||
| -rw-r--r-- | src/plugins/geoservices/mapboxgl/mapboxgl.pro | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/src/3rdparty/icu_dependency.pri b/src/3rdparty/icu_dependency.pri deleted file mode 100644 index 6318631f..00000000 --- a/src/3rdparty/icu_dependency.pri +++ /dev/null @@ -1,13 +0,0 @@ -win32 { - CONFIG(static, static|shared) { - CONFIG(debug, debug|release) { - LIBS_PRIVATE += -lsicuind -lsicuucd -lsicudtd - } else { - LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt - } - } else { - LIBS_PRIVATE += -licuin -licuuc -licudt - } -} else { - LIBS_PRIVATE += -licui18n -licuuc -licudata -} diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native -Subproject 1c633072fcea7ad153ab6f8ec40dd72d83541ea +Subproject a2120304a881507ed60c3199925946c1df06b44 diff --git a/src/plugins/geoservices/mapboxgl/mapboxgl.pro b/src/plugins/geoservices/mapboxgl/mapboxgl.pro index f35f26dc..2cecb820 100644 --- a/src/plugins/geoservices/mapboxgl/mapboxgl.pro +++ b/src/plugins/geoservices/mapboxgl/mapboxgl.pro @@ -35,7 +35,7 @@ load(qt_build_paths) LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqmapboxgl$$qtPlatformTargetSuffix() qtConfig(icu) { - include(../../../3rdparty/icu_dependency.pri) + QMAKE_USE_PRIVATE += icu } # When building for Windows with dynamic OpenGL, this plugin |