diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-23 13:55:55 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-26 18:09:42 +0100 |
| commit | d8d9c4fbb6047b59b98108d6e3221206aa926ccd (patch) | |
| tree | b3e106b3e803b33804247b27f131e53c1d60dc12 /src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp | |
| parent | 3a10cee763b98e13dc70e585ff59d0b8e48e60e0 (diff) | |
Don't reparent network replies away from their owning network manager
This can cause bad things to happen when the network manager owning
the replies gets deleted. The network manager destructor usually cleans
up it's own replies. When reparenting them away that won't happen, but
the replies might still have pending events and have pointers back
into the network manager.
Change-Id: I1d8330a198e9225a557d127f4a91247bcfa4812f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp')
| -rw-r--r-- | src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp index 865396ba..ec9b18fb 100644 --- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp @@ -49,7 +49,6 @@ QGeoMapReplyNokia::QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTileSpec &s : QGeoTiledMapReply(spec, parent), m_reply(reply) { - m_reply->setParent(this); connect(m_reply, SIGNAL(finished()), this, @@ -59,11 +58,6 @@ QGeoMapReplyNokia::QGeoMapReplyNokia(QNetworkReply *reply, const QGeoTileSpec &s SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(networkError(QNetworkReply::NetworkError))); - - connect(m_reply, - SIGNAL(destroyed()), - this, - SLOT(replyDestroyed())); } QGeoMapReplyNokia::~QGeoMapReplyNokia() @@ -83,11 +77,6 @@ void QGeoMapReplyNokia::abort() m_reply->abort(); } -void QGeoMapReplyNokia::replyDestroyed() -{ - m_reply = 0; -} - void QGeoMapReplyNokia::networkFinished() { if (!m_reply) |