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/mapbox-gl-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty/mapbox-gl-native') 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 -- cgit v1.2.1 From 2abeb49cf87d694d5f8916281f8ede12694742c1 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Mon, 13 Nov 2017 13:02:38 +0200 Subject: Bump Mapbox GL version Bumps Mapbox GL to a new version that fixes the Qt-based database SQLite query binding for text data. Also, replaces 'QImage::byteCount()' with 'QImage::sizeInBytes()' to avoid deprecation warnings in Qt 5.10 onwards. mapbox-gl-native @ 3bef7593a64a51e86dd5a2ed9fd36b4a143350b0 Task-number: QTBUG-63013 Change-Id: I81fb4d8a7cb36fe96e28e28692411460edde5c96 Reviewed-by: Paolo Angelelli --- src/3rdparty/mapbox-gl-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty/mapbox-gl-native') diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native index a2120304..572822c8 160000 --- a/src/3rdparty/mapbox-gl-native +++ b/src/3rdparty/mapbox-gl-native @@ -1 +1 @@ -Subproject commit a2120304a881507ed60c3199925946c1df06b44c +Subproject commit 572822c8ca15be190b43afbf7f91d132e988bf21 -- cgit v1.2.1