Merge remote-tracking branch 'origin/5.11.0' into 5.11

Change-Id: I0bb00d16c891856cfbe1042ce166bbd156e9f41b

1 files changed, 2 insertions, 1 deletions

diff --git a/src/location/labs/qmappolylineobject.cpp b/src/location/labs/qmappolylineobject.cpp
index bea79327..1c351962 100644
--- a/src/location/labs/qmappolylineobject.cpp
+++ b/src/location/labs/qmappolylineobject.cpp
@@ -209,7 +209,8 @@ void QMapPolylineObject::setMap(QGeoMap *map)
     QGeoMapObject::setMap(map); // This is where the specialized pimpl gets created and injected
 
     if (!map) {
-        // Map was set, now it has ben re-set to NULL
+        // Map was set, now it has ben re-set to NULL, but not inside d_ptr.
+        // so m_map inside d_ptr can still be used to remove itself, inside the destructor.
         d_ptr = new QMapPolylineObjectPrivateDefault(*d);
         // Old pimpl deleted implicitly by QExplicitlySharedDataPointer
     }