diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-28 17:39:19 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-05-02 19:33:54 +0300 |
commit | 133f71dd01eb33bf238d7deaa631596492e40ee4 (patch) | |
tree | 9b3cca24388e7b3287e0a40b030ebcb4ecb20cc2 /platform/qt | |
parent | a02686447a04cf8d5c0ee1664d39747a15206c30 (diff) | |
download | qtlocation-mapboxgl-133f71dd01eb33bf238d7deaa631596492e40ee4.tar.gz |
[Qt] Add more properties stubs
Diffstat (limited to 'platform/qt')
-rw-r--r-- | platform/qt/include/qquickmapboxgl.hpp | 13 | ||||
-rw-r--r-- | platform/qt/qmlapp/main.qml | 3 | ||||
-rw-r--r-- | platform/qt/src/qquickmapboxgl.cpp | 23 |
3 files changed, 39 insertions, 0 deletions
diff --git a/platform/qt/include/qquickmapboxgl.hpp b/platform/qt/include/qquickmapboxgl.hpp index 6d24ca6732..e49e93f32b 100644 --- a/platform/qt/include/qquickmapboxgl.hpp +++ b/platform/qt/include/qquickmapboxgl.hpp @@ -16,6 +16,8 @@ class Q_DECL_EXPORT QQuickMapboxGL : public QQuickFramebufferObject Q_PROPERTY(qreal zoomLevel READ zoomLevel WRITE setZoomLevel NOTIFY zoomLevelChanged) Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY centerChanged) Q_PROPERTY(QGeoShape visibleRegion READ visibleRegion WRITE setVisibleRegion) + Q_PROPERTY(bool copyrightsVisible READ copyrightsVisible WRITE setCopyrightsVisible NOTIFY copyrightsVisibleChanged) + Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) public: QQuickMapboxGL(QQuickItem *parent = 0); @@ -39,6 +41,12 @@ public: void setVisibleRegion(const QGeoShape &shape); QGeoShape visibleRegion() const; + void setCopyrightsVisible(bool visible); + bool copyrightsVisible() const; + + void setColor(const QColor &color); + QColor color() const; + enum SyncState { NothingNeedsSync = 0x00, ZoomNeedsSync = 0x01, @@ -53,6 +61,11 @@ signals: void zoomLevelChanged(qreal zoomLevel); void centerChanged(const QGeoCoordinate &coordinate); + // Compatibility with Map QML Type, but no-op. + void copyrightLinkActivated(const QString &link); + void copyrightsVisibleChanged(bool visible); + void colorChanged(const QColor &color); + private: qreal m_minimumZoomLevel = 0; qreal m_maximumZoomLevel = 20; diff --git a/platform/qt/qmlapp/main.qml b/platform/qt/qmlapp/main.qml index 5e7e1daafa..6a09d6051a 100644 --- a/platform/qt/qmlapp/main.qml +++ b/platform/qt/qmlapp/main.qml @@ -25,6 +25,9 @@ ApplicationWindow { zoomLevel: 14 minimumZoomLevel: 8 maximumZoomLevel: 16 + + color: "red" + copyrightsVisible: true } } } diff --git a/platform/qt/src/qquickmapboxgl.cpp b/platform/qt/src/qquickmapboxgl.cpp index 96af258214..dd0a7c8f1d 100644 --- a/platform/qt/src/qquickmapboxgl.cpp +++ b/platform/qt/src/qquickmapboxgl.cpp @@ -113,6 +113,29 @@ QGeoShape QQuickMapboxGL::visibleRegion() const return m_visibleRegion; } +void QQuickMapboxGL::setCopyrightsVisible(bool) +{ + qWarning() << __PRETTY_FUNCTION__ + << "Not implemented."; +} + +bool QQuickMapboxGL::copyrightsVisible() const +{ + return false; +} + +void QQuickMapboxGL::setColor(const QColor &) +{ + // TODO: can be made functional after landing #837 + qWarning() << __PRETTY_FUNCTION__ + << "Use Mapbox Studio to change the map background color."; +} + +QColor QQuickMapboxGL::color() const +{ + return QColor(); +} + int QQuickMapboxGL::swapSyncState() { int oldState = m_syncState; |