From fc140e265b559868a2a9f568583689ee4a6b9dfd Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 2 Mar 2018 19:43:30 +0200 Subject: [Qt] Expose mapLoadingFailed signal --- platform/qt/include/qmapboxgl.hpp | 1 + 1 file changed, 1 insertion(+) (limited to 'platform/qt/include') diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index bc18eaba59..7b07a0dff6 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -251,6 +251,7 @@ public slots: signals: void needsRendering(); void mapChanged(QMapboxGL::MapChange); + void mapLoadingFailed(const QString &reason); void copyrightsChanged(const QString ©rightsHtml); void staticRenderFinished(const QString &error); -- cgit v1.2.1 From 803a4d46ed15a790876f5bda0e1d49d9ba0483a4 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Mon, 5 Mar 2018 13:47:31 -0500 Subject: [Qt] Added QMapboxGL::MapLoadingFailure enum --- platform/qt/include/qmapboxgl.hpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'platform/qt/include') diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index 7b07a0dff6..b5676fbedd 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -128,6 +128,13 @@ public: MapChangeSourceDidChange }; + enum MapLoadingFailure { + StyleParseFailure, + StyleLoadFailure, + NotFoundFailure, + UnknownFailure + }; + // Determines the orientation of the map. enum NorthOrientation { NorthUpwards, // Default @@ -251,7 +258,7 @@ public slots: signals: void needsRendering(); void mapChanged(QMapboxGL::MapChange); - void mapLoadingFailed(const QString &reason); + void mapLoadingFailed(QMapboxGL::MapLoadingFailure, const QString &reason); void copyrightsChanged(const QString ©rightsHtml); void staticRenderFinished(const QString &error); @@ -263,5 +270,6 @@ private: }; Q_DECLARE_METATYPE(QMapboxGL::MapChange); +Q_DECLARE_METATYPE(QMapboxGL::MapLoadingFailure); #endif // QMAPBOXGL_H -- cgit v1.2.1 From 07ad29d30da44ded2bf40418b3625fecfb817399 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Mon, 14 May 2018 16:44:43 +0300 Subject: [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++. --- platform/qt/include/qmapbox.hpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'platform/qt/include') 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 { -- cgit v1.2.1