summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2018-04-25 11:44:50 -0700
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2018-04-25 11:44:50 -0700
commit644c7796c71dbbec84e75ad4c0d5945be368350d (patch)
tree296852445f110867ab6777fec0ee6303209316c0
parentec847e2145f0fcdd6e1992e734afecf46a2376b8 (diff)
downloadqtlocation-mapboxgl-644c7796c71dbbec84e75ad4c0d5945be368350d.tar.gz
Fix MinGW build
-rw-r--r--mapbox-gl-native.pro1
-rw-r--r--platform/qt/include/qmapbox.hpp10
2 files changed, 7 insertions, 4 deletions
diff --git a/mapbox-gl-native.pro b/mapbox-gl-native.pro
index a9a7a4d65e..f7385b160d 100644
--- a/mapbox-gl-native.pro
+++ b/mapbox-gl-native.pro
@@ -10,7 +10,6 @@ QT += network-private \
QMAKE_CXXFLAGS += \
-DNDEBUG \
- -DQT_BUILD_MAPBOXGL_LIB \
-DQT_IMAGE_DECODERS \
-DRAPIDJSON_HAS_STDSTRING=1 \
-DMBGL_USE_GLES2 \
diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp
index 5a5198108c..471616daee 100644
--- a/platform/qt/include/qmapbox.hpp
+++ b/platform/qt/include/qmapbox.hpp
@@ -9,10 +9,14 @@
// 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
+#if !defined(QT_MAPBOXGL_STATIC)
+# if defined(QT_BUILD_MAPBOXGL_LIB)
+# define Q_MAPBOXGL_EXPORT Q_DECL_EXPORT
+# else
+# define Q_MAPBOXGL_EXPORT Q_DECL_IMPORT
+# endif
#else
- #define Q_MAPBOXGL_EXPORT Q_DECL_IMPORT
+# define Q_MAPBOXGL_EXPORT
#endif
namespace QMapbox {