From b187e609c152509c30e863ac4662d9a606a53865 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Mon, 9 Oct 2017 17:51:21 +0300 Subject: 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 --- src/3rdparty/icu_dependency.pri | 13 ------------- src/3rdparty/mapbox-gl-native | 2 +- src/plugins/geoservices/mapboxgl/mapboxgl.pro | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 src/3rdparty/icu_dependency.pri (limited to 'src') 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 index 1c633072..a2120304 160000 --- a/src/3rdparty/mapbox-gl-native +++ b/src/3rdparty/mapbox-gl-native @@ -1 +1 @@ -Subproject commit 1c633072fcea7ad153ab6f8ec40dd72d83541ead +Subproject commit a2120304a881507ed60c3199925946c1df06b44c 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 -- cgit v1.2.1