summaryrefslogtreecommitdiff
path: root/src/location/maps/qgeotilefetcher_p_p.h
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@jollamobile.com>2014-02-10 13:16:15 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-10 14:48:25 +0100
commitcdf5af5ba4c80c98cf4967ecf82ecac80ce3b854 (patch)
tree6e5701ac6f5b2c602353430962f6ea5621d46fbc /src/location/maps/qgeotilefetcher_p_p.h
parent62234914bc39be509c6a764c99d592e0bc5ecb5c (diff)
downloadqtlocation-cdf5af5ba4c80c98cf4967ecf82ecac80ce3b854.tar.gz
Test that the mapping manager engine pointer is still valid.
QPointer holds a guarded pointer to a QObject. It must always be tested prior to use. Changed the parameter type to remove the need for the static_cast when setting the QPointer member. The root cause was that the tile fetcher object was not being destroyed when the mapping manager engine was. Which was because the two objects were in different threads. Some of the service specific tile fetchers were directly calling into the engine objects across thread. Gah. Since Qt 5 QNAM uses an application global thread for processing requests, there is no need to use threads in the tile fetcher. Change-Id: Id9df35ddfa78df2cbf334006fe5fc9726a75f92d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/location/maps/qgeotilefetcher_p_p.h')
-rw-r--r--src/location/maps/qgeotilefetcher_p_p.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/location/maps/qgeotilefetcher_p_p.h b/src/location/maps/qgeotilefetcher_p_p.h
index c47f8f90..aa452413 100644
--- a/src/location/maps/qgeotilefetcher_p_p.h
+++ b/src/location/maps/qgeotilefetcher_p_p.h
@@ -73,11 +73,9 @@ class QGeoTiledMappingManagerEngine;
class QGeoTileFetcherPrivate
{
public:
- explicit QGeoTileFetcherPrivate(QGeoTiledMappingManagerEngine *engine);
+ QGeoTileFetcherPrivate();
virtual ~QGeoTileFetcherPrivate();
- QGeoTiledMappingManagerEngine *engine_;
-
bool enabled_;
QBasicTimer timer_;
QMutex queueMutex_;