diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-08-13 11:30:15 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-09-26 11:37:06 -0700 |
| commit | f30765254807bedab0873a289a118906ef74b754 (patch) | |
| tree | 0988f52d73931b05718642c218c8241421882eb8 /platform | |
| parent | 78af55f30a37165c960c90db9a96801effc850f6 (diff) | |
| download | qtlocation-mapboxgl-f30765254807bedab0873a289a118906ef74b754.tar.gz | |
[core] Source-driven attribution
Implemented observer callbacks so the style knows when the source’s attribution changes and the map knows when the style’s attribution changes. Also implemented a getter for a tile source’s attribution.
Fixes #2723.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/qt/include/qmapbox.hpp | 3 | ||||
| -rw-r--r-- | platform/qt/include/qmapboxgl.hpp | 1 | ||||
| -rw-r--r-- | platform/qt/src/qmapbox.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/platform/qt/include/qmapbox.hpp b/platform/qt/include/qmapbox.hpp index dcdc33d59d..0a6a41b3e1 100644 --- a/platform/qt/include/qmapbox.hpp +++ b/platform/qt/include/qmapbox.hpp @@ -45,7 +45,8 @@ enum MapChange { MapChangeWillStartRenderingMap, MapChangeDidFinishRenderingMap, MapChangeDidFinishRenderingMapFullyRendered, - MapChangeDidFinishLoadingStyle + MapChangeDidFinishLoadingStyle, + MapChangeSourceAttributionDidChange }; struct Q_DECL_EXPORT CameraOptions { diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index fec96e6fb7..ba5631e1e4 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -95,7 +95,6 @@ public: NorthLeftwards, }; - QMapboxGL(QObject *parent = 0, const QMapboxGLSettings& = QMapboxGLSettings()); virtual ~QMapboxGL(); diff --git a/platform/qt/src/qmapbox.cpp b/platform/qt/src/qmapbox.cpp index 5f4ad01873..4a871c151d 100644 --- a/platform/qt/src/qmapbox.cpp +++ b/platform/qt/src/qmapbox.cpp @@ -32,6 +32,7 @@ static_assert(mbgl::underlying_type(QMapbox::MapChangeWillStartRenderingMap) == static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishRenderingMap) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingMap), "error"); static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishRenderingMapFullyRendered) == mbgl::underlying_type(mbgl::MapChangeDidFinishRenderingMapFullyRendered), "error"); static_assert(mbgl::underlying_type(QMapbox::MapChangeDidFinishLoadingStyle) == mbgl::underlying_type(mbgl::MapChangeDidFinishLoadingStyle), "error"); +static_assert(mbgl::underlying_type(QMapbox::MapChangeSourceAttributionDidChange) == mbgl::underlying_type(mbgl::MapChangeSourceAttributionDidChange), "error"); namespace QMapbox { |