From c77d8c17c0264fd902aa0fcd54a435f6a9f216b0 Mon Sep 17 00:00:00 2001 From: Thomas Lowe Date: Fri, 18 May 2012 16:26:27 +1000 Subject: Correct destruction of mappingManagerEngine Use of weakPointer to prevent accessing deleted memory. Plus thread exiting to cause the fetcher and thread to destroy themselves. Additional use of weak pointers to deal with the complexity of the mapping manager destructing before the declarative objects. Task-number: QTBUG-25797 Change-Id: I6a27568580c1a00f7588565ff7e35d63eb5dd785 Reviewed-by: Aaron McCarthy --- src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h') diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h index 610dc147..eb5f02b7 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h @@ -93,7 +93,7 @@ private: QString getLanguageString() const; - QGeoTiledMappingManagerEngineNokia *m_engineNokia; + QWeakPointer m_engineNokia; QGeoNetworkAccessManager *m_networkManager; QMap m_parameters; QSize m_tileSize; -- cgit v1.2.1