Implementing deregisterMap to avoid crashes on slow requests

Previously, high-latency requests that were still running could complete
after deregisterMap() was called, and a pointer to the old QGeoMap
would still be present in the array -- which triggered a segfault. Now
we make sure to remove all references to a disappearing map.

This patch also handles a common destructor race causing similar segfaults
at exit (and in autotests)

Change-Id: I936d6c0d556d79fc43aa238b0b1d3dc63e5db11e
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h
index fe6f74b3..aa877985 100644
--- a/src/location/maps/qgeomappingmanager.h
+++ b/src/location/maps/qgeomappingmanager.h
@@ -45,6 +45,7 @@
 #include <QObject>
 #include <QSize>
 #include <QPair>
+#include <QSharedPointer>
 #include <QtLocation/qlocationglobal.h>
 #include "qgeomaptype.h"
 
@@ -113,7 +114,7 @@ Q_SIGNALS:
 private:
     QGeoMappingManager(QGeoMappingManagerEngine *engine, QObject *parent = 0);
 
-    QGeoMappingManagerPrivate* d_ptr;
+    QSharedPointer<QGeoMappingManagerPrivate> d_ptr;
     Q_DISABLE_COPY(QGeoMappingManager)
 
     friend class QGeoServiceProvider;