[qt] Fix build when building the Qt Location plugin

- MinGW has to explicitly know that is building a static library.
- Android doesn't have 'round' on the std:: namespace when using g++.

2 files changed, 8 insertions, 4 deletions

diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp
index 369890343f..1ab04403cf 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 {
diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp
index c257dbf2bb..bcde09e1b6 100644
--- a/src/mbgl/style/expression/compound_expression.cpp
+++ b/src/mbgl/style/expression/compound_expression.cpp
@@ -364,7 +364,7 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
         return result;
     });
     
-    define("round", [](double x) -> Result<double> { return std::round(x); });
+    define("round", [](double x) -> Result<double> { return ::round(x); });
     define("floor", [](double x) -> Result<double> { return std::floor(x); });
     define("ceil", [](double x) -> Result<double> { return std::ceil(x); });
     define("abs", [](double x) -> Result<double> { return std::abs(x); });