diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:03:53 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:03:53 +0200 |
| commit | b392921e33b4e8d425f1881afb95e6d34e53879c (patch) | |
| tree | c7ab55116cde52981495c2158274eda0eb477b8a | |
| parent | 394f7a1dc772d2dfa1a65b456e623b7d09d0d482 (diff) | |
| parent | 397a31b187d537f81610007b7d0f6f69b306dfd4 (diff) | |
| download | qtlocation-b392921e33b4e8d425f1881afb95e6d34e53879c.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3
Change-Id: I3f63ff19e947a440286f57bf4734780e8d05a5cd
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapitemview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp index 3208829c..f7a251a2 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp @@ -140,17 +140,17 @@ void QDeclarativeGeoMapItemView::classBegin() // connect(m_delegateModel, &QQmlInstanceModel::initItem, this, &QDeclarativeGeoMapItemView::initItem); } -void QDeclarativeGeoMapItemView::destroyingItem(QObject */*object*/) +void QDeclarativeGeoMapItemView::destroyingItem(QObject * /*object*/) { } -void QDeclarativeGeoMapItemView::initItem(int /*index*/, QObject */*object*/) +void QDeclarativeGeoMapItemView::initItem(int /*index*/, QObject * /*object*/) { } -void QDeclarativeGeoMapItemView::createdItem(int index, QObject */*object*/) +void QDeclarativeGeoMapItemView::createdItem(int index, QObject * /*object*/) { if (!m_map) return; |