summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-14 03:00:10 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-14 03:00:10 +0200
commitf9079e89b25f9dd664a7791f5eb5f9a16a6a5e58 (patch)
tree81c08a093eb0d5616e815304d911e9d0e7e75994
parent896f208cdc2ef6665a61796f599c02052c81655a (diff)
parentabcb5d1bccbc5913b7d994e0ad2685d484c35740 (diff)
downloadqtlocation-f9079e89b25f9dd664a7791f5eb5f9a16a6a5e58.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I749522d1f277159d4ee222c59b07044e954c3926
-rw-r--r--src/location/labs/qsg/qmappolygonobjectqsg.cpp2
-rw-r--r--src/location/labs/qsg/qmappolylineobjectqsg.cpp2
-rw-r--r--src/location/labs/qsg/qqsgmapobject.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/location/labs/qsg/qmappolygonobjectqsg.cpp b/src/location/labs/qsg/qmappolygonobjectqsg.cpp
index 239df177..99a84ec5 100644
--- a/src/location/labs/qsg/qmappolygonobjectqsg.cpp
+++ b/src/location/labs/qsg/qmappolygonobjectqsg.cpp
@@ -78,7 +78,7 @@ QList<QDoubleVector2D> QMapPolygonObjectPrivateQSG::projectPath()
QSGNode *QMapPolygonObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode,
VisibleNode **visibleNode,
QSGNode *root,
- QQuickWindow */*window*/)
+ QQuickWindow * /*window*/)
{
Q_UNUSED(visibleNode)
MapPolygonNode *node = static_cast<MapPolygonNode *>(oldNode);
diff --git a/src/location/labs/qsg/qmappolylineobjectqsg.cpp b/src/location/labs/qsg/qmappolylineobjectqsg.cpp
index f4a1a288..5b184326 100644
--- a/src/location/labs/qsg/qmappolylineobjectqsg.cpp
+++ b/src/location/labs/qsg/qmappolylineobjectqsg.cpp
@@ -100,7 +100,7 @@ void QMapPolylineObjectPrivateQSG::updateGeometry()
QSGNode *QMapPolylineObjectPrivateQSG::updateMapObjectNode(QSGNode *oldNode,
VisibleNode **visibleNode,
QSGNode *root,
- QQuickWindow */*window*/)
+ QQuickWindow * /*window*/)
{
Q_UNUSED(visibleNode)
MapPolylineNode *node = static_cast<MapPolylineNode *>(oldNode);
diff --git a/src/location/labs/qsg/qqsgmapobject.cpp b/src/location/labs/qsg/qqsgmapobject.cpp
index ccda12d8..8c42dff2 100644
--- a/src/location/labs/qsg/qqsgmapobject.cpp
+++ b/src/location/labs/qsg/qqsgmapobject.cpp
@@ -50,7 +50,7 @@ QQSGMapObject::~QQSGMapObject()
}
QSGNode *QQSGMapObject::updateMapObjectNode(QSGNode *oldNode,
- VisibleNode **/*visibleNode*/,
+ VisibleNode ** /*visibleNode*/,
QSGNode * /*root*/,
QQuickWindow * /*window*/)
{