From 13d7f66c71eb94d0dbf6604da352605ed0f547da Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <tmpsantos@gmail.com>
Date: Sat, 24 Feb 2018 18:52:57 +0200
Subject: Bump Mapbox GL Native

mapbox-gl-native @ 5de373fff0e71496b6aa11ecb6556f958a28d80b
---
 platform/qt/include/qmapbox.hpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'platform/qt/include/qmapbox.hpp')

diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp
index 2bb5d8705c..5a5198108c 100644
--- a/platform/qt/include/qmapbox.hpp
+++ b/platform/qt/include/qmapbox.hpp
@@ -9,6 +9,12 @@
 
 // This header follows the Qt coding style: https://wiki.qt.io/Qt_Coding_Style
 
+#if defined(QT_BUILD_MAPBOXGL_LIB)
+    #define Q_MAPBOXGL_EXPORT Q_DECL_EXPORT
+#else
+    #define Q_MAPBOXGL_EXPORT Q_DECL_IMPORT
+#endif
+
 namespace QMapbox {
 
 typedef QPair<double, double> Coordinate;
@@ -20,7 +26,7 @@ typedef QList<Coordinates> CoordinatesCollection;
 
 typedef QList<CoordinatesCollection> CoordinatesCollections;
 
-struct Q_DECL_EXPORT Feature {
+struct Q_MAPBOXGL_EXPORT Feature {
     enum Type {
         PointType = 1,
         LineStringType,
@@ -38,7 +44,7 @@ struct Q_DECL_EXPORT Feature {
     QVariant id;
 };
 
-struct Q_DECL_EXPORT ShapeAnnotationGeometry {
+struct Q_MAPBOXGL_EXPORT ShapeAnnotationGeometry {
     enum Type {
         LineStringType = 1,
         PolygonType,
@@ -54,12 +60,12 @@ struct Q_DECL_EXPORT ShapeAnnotationGeometry {
     CoordinatesCollections geometry;
 };
 
-struct Q_DECL_EXPORT SymbolAnnotation {
+struct Q_MAPBOXGL_EXPORT SymbolAnnotation {
     Coordinate geometry;
     QString icon;
 };
 
-struct Q_DECL_EXPORT LineAnnotation {
+struct Q_MAPBOXGL_EXPORT LineAnnotation {
     /*! Class constructor. */
     LineAnnotation(const ShapeAnnotationGeometry& geometry_ = ShapeAnnotationGeometry(), float opacity_ = 1.0f,
             float width_ = 1.0f, const QColor& color_ = Qt::black)
@@ -71,7 +77,7 @@ struct Q_DECL_EXPORT LineAnnotation {
     QColor color;
 };
 
-struct Q_DECL_EXPORT FillAnnotation {
+struct Q_MAPBOXGL_EXPORT FillAnnotation {
     /*! Class constructor. */
     FillAnnotation(const ShapeAnnotationGeometry& geometry_ = ShapeAnnotationGeometry(), float opacity_ = 1.0f,
             const QColor& color_ = Qt::black, const QVariant& outlineColor_ = QVariant())
@@ -92,13 +98,13 @@ enum NetworkMode {
     Offline,
 };
 
-Q_DECL_EXPORT QList<QPair<QString, QString> >& defaultStyles();
+Q_MAPBOXGL_EXPORT QList<QPair<QString, QString> >& defaultStyles();
 
-Q_DECL_EXPORT NetworkMode networkMode();
-Q_DECL_EXPORT void setNetworkMode(NetworkMode);
+Q_MAPBOXGL_EXPORT NetworkMode networkMode();
+Q_MAPBOXGL_EXPORT void setNetworkMode(NetworkMode);
 
 // This struct is a 1:1 copy of mbgl::CustomLayerRenderParameters.
-struct Q_DECL_EXPORT CustomLayerRenderParameters {
+struct Q_MAPBOXGL_EXPORT CustomLayerRenderParameters {
     double width;
     double height;
     double latitude;
-- 
cgit v1.2.1