diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-03-14 11:31:43 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-03-14 09:38:03 +0000 |
| commit | 14fab0fd41040bf83792cb2a390e0b4eba8e4d6e (patch) | |
| tree | 09877271da3bbe591f008b83dfda1483692159bc | |
| parent | cecf2dd464127420905c7b39b1df74b237bf230a (diff) | |
| download | qtlocation-14fab0fd41040bf83792cb2a390e0b4eba8e4d6e.tar.gz | |
Fix build when building with -qt-zlib
Qt configures zlib to prefix symbols with z_ and
that was messing with mapbox-gl-native own
function names due to preprocessor sorcery.
Task-number: QTBUG-59447
Change-Id: Ib664a33103990f262b6979953d1415d06f230fd3
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| m--------- | src/3rdparty/mapbox-gl-native | 0 | ||||
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 6 | ||||
| -rw-r--r-- | src/plugins/geoservices/mapboxgl/mapboxgl.pro | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native -Subproject 58b3bfbd0001f47fd88288e250d2028173dc0b2 +Subproject edd127ee7658ceb7f5f2f740bce75db1cbf25c0 diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri new file mode 100644 index 00000000..2c714b32 --- /dev/null +++ b/src/3rdparty/zlib_dependency.pri @@ -0,0 +1,6 @@ +# zlib dependency satisfied by bundled 3rd party zlib or system zlib +qtConfig(system-zlib) { + QMAKE_USE_PRIVATE += zlib +} else { + QT_PRIVATE += zlib-private +} diff --git a/src/plugins/geoservices/mapboxgl/mapboxgl.pro b/src/plugins/geoservices/mapboxgl/mapboxgl.pro index 4fd6127c..37dd383c 100644 --- a/src/plugins/geoservices/mapboxgl/mapboxgl.pro +++ b/src/plugins/geoservices/mapboxgl/mapboxgl.pro @@ -29,13 +29,15 @@ OTHER_FILES += \ INCLUDEPATH += ../../../3rdparty/mapbox-gl-native/platform/qt/include -load(qt_build_paths) -LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqmapboxgl - qtConfig(icu) { include(../../../3rdparty/icu_dependency.pri) } +include(../../../3rdparty/zlib_dependency.pri) + +load(qt_build_paths) +LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqmapboxgl + PLUGIN_TYPE = geoservices PLUGIN_CLASS_NAME = QGeoServiceProviderFactoryMapboxGL load(qt_plugin) |