diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-07 03:01:46 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-07 03:01:46 +0200 |
commit | a8793c6d9695498b3a53793f21859421262b4541 (patch) | |
tree | a783f6f0a1bd6c8dc5c4c57438da981e6b5dd17f /src/location/declarativemaps/qdeclarativegeomap.cpp | |
parent | b06a07cf9fd474e11fbe467047e5fe0322b677f0 (diff) | |
parent | eda2a7c286058176e1906d0ddc88d4e2cfbec55e (diff) | |
download | qtlocation-a8793c6d9695498b3a53793f21859421262b4541.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If3ebc0821be0d0206522adf8ff10040e80e34414
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomap.cpp')
-rw-r--r-- | src/location/declarativemaps/qdeclarativegeomap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index 17baf811..e68961e5 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -1497,7 +1497,7 @@ QMargins QDeclarativeGeoMap::mapMargins() const */ QQmlListProperty<QDeclarativeGeoMapType> QDeclarativeGeoMap::supportedMapTypes() { - return QQmlListProperty<QDeclarativeGeoMapType>(this, m_supportedMapTypes); + return QQmlListProperty<QDeclarativeGeoMapType>(this, &m_supportedMapTypes); } /*! |