5 files changed, 11 insertions, 66 deletions
diff --git a/src/location/maps/qgeotiledmappingmanagerengine.cpp b/src/location/maps/qgeotiledmappingmanagerengine.cpp
index c0382b1a..69532f44 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine.cpp
+++ b/src/location/maps/qgeotiledmappingmanagerengine.cpp
@@ -74,9 +74,6 @@ void QGeoTiledMappingManagerEngine::setTileFetcher(QGeoTileFetcher *fetcher)
     Q_D(QGeoTiledMappingManagerEngine);
 
     d->fetcher_ = fetcher;
-    d->fetcher_->init();
-
-    d->thread_ = new QThread;
 
     qRegisterMetaType<QGeoTileSpec>();
 
@@ -91,26 +88,7 @@ void QGeoTiledMappingManagerEngine::setTileFetcher(QGeoTileFetcher *fetcher)
             SLOT(engineTileError(QGeoTileSpec,QString)),
             Qt::QueuedConnection);
 
-    d->fetcher_->moveToThread(d_ptr->thread_);
-
-    connect(d->thread_,
-            SIGNAL(started()),
-            d->fetcher_,
-            SLOT(threadStarted()));
-
-    connect(d->thread_,
-            SIGNAL(finished()),
-            d->fetcher_,
-            SLOT(threadFinished()));
-
-    connect(d->fetcher_,
-            SIGNAL(destroyed()),
-            d->thread_,
-            SLOT(deleteLater()));
-
     engineInitialized();
-
-    QTimer::singleShot(0, d->thread_, SLOT(start()));
 }
 
 QGeoTileFetcher *QGeoTiledMappingManagerEngine::tileFetcher()
@@ -318,17 +296,13 @@ QSharedPointer<QGeoTileTexture> QGeoTiledMappingManagerEngine::getTileTexture(co
 *******************************************************************************/
 
 QGeoTiledMappingManagerEnginePrivate::QGeoTiledMappingManagerEnginePrivate()
-  : thread_(0),
-    cacheHint_(QGeoTiledMappingManagerEngine::AllCaches),
-    tileCache_(0),
-    fetcher_(0) {}
+:   cacheHint_(QGeoTiledMappingManagerEngine::AllCaches), tileCache_(0), fetcher_(0)
+{
+}
 
 QGeoTiledMappingManagerEnginePrivate::~QGeoTiledMappingManagerEnginePrivate()
 {
     delete tileCache_;
-
-    // will delete fetcher and thread later
-    thread_->exit();
 }
 
 #include "moc_qgeotiledmappingmanagerengine_p.cpp"
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p_p.h
index ae26ab46..dfdab6de 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p_p.h
@@ -55,10 +55,8 @@
 //
 
 #include <QSize>
-#include <QList>
 #include <QHash>
 #include <QSet>
-#include <QThread>
 #include "qgeotiledmappingmanagerengine_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -74,7 +72,6 @@ public:
     QGeoTiledMappingManagerEnginePrivate();
     ~QGeoTiledMappingManagerEnginePrivate();
 
-    QThread *thread_;
     QSize tileSize_;
     QSet<QGeoTiledMapData *> tileMaps_;
     QHash<QGeoTiledMapData *, QSet<QGeoTileSpec> > mapHash_;
diff --git a/src/location/maps/qgeotilefetcher.cpp b/src/location/maps/qgeotilefetcher.cpp
index a86c0a43..e0d6b6ea 100644
--- a/src/location/maps/qgeotilefetcher.cpp
+++ b/src/location/maps/qgeotilefetcher.cpp
@@ -50,21 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QGeoTileFetcher::QGeoTileFetcher(QGeoTiledMappingManagerEngine *engine, QObject *parent)
-    : QObject(parent),
-      d_ptr(new QGeoTileFetcherPrivate(engine))
-{
-    Q_D(QGeoTileFetcher);
-    d->engine_ = engine;
-}
-
-QGeoTileFetcher::~QGeoTileFetcher()
-{
-    Q_D(QGeoTileFetcher);
-    delete d;
-}
-
-void QGeoTileFetcher::threadStarted()
+QGeoTileFetcher::QGeoTileFetcher(QObject *parent)
+:   QObject(parent), d_ptr(new QGeoTileFetcherPrivate)
 {
     Q_D(QGeoTileFetcher);
 
@@ -74,18 +61,10 @@ void QGeoTileFetcher::threadStarted()
         d->timer_.start(0, this);
 }
 
-bool QGeoTileFetcher::init()
-{
-    return false;
-}
-
-void QGeoTileFetcher::threadFinished()
+QGeoTileFetcher::~QGeoTileFetcher()
 {
-    Q_D(QGeoTileFetcher);
 
-    d->enabled_ = false;
-    d->timer_.stop();
-    this->deleteLater();
+    delete d_ptr;
 }
 
 void QGeoTileFetcher::updateTileRequests(const QSet<QGeoTileSpec> &tilesAdded,
@@ -213,8 +192,8 @@ void QGeoTileFetcher::handleReply(QGeoTiledMapReply *reply, const QGeoTileSpec &
 /*******************************************************************************
 *******************************************************************************/
 
-QGeoTileFetcherPrivate::QGeoTileFetcherPrivate(QGeoTiledMappingManagerEngine *engine)
-:   engine_(engine), enabled_(false)
+QGeoTileFetcherPrivate::QGeoTileFetcherPrivate()
+:   enabled_(false)
 {
 }
 
diff --git a/src/location/maps/qgeotilefetcher_p.h b/src/location/maps/qgeotilefetcher_p.h
index d08092b9..36b6e0dc 100644
--- a/src/location/maps/qgeotilefetcher_p.h
+++ b/src/location/maps/qgeotilefetcher_p.h
@@ -72,12 +72,10 @@ class Q_LOCATION_EXPORT QGeoTileFetcher : public QObject
     Q_OBJECT
 
 public:
-    QGeoTileFetcher(QGeoTiledMappingManagerEngine *engine, QObject *parent = 0);
+    QGeoTileFetcher(QObject *parent = 0);
     virtual ~QGeoTileFetcher();
 
 public Q_SLOTS:
-    void threadStarted();
-    void threadFinished();
     void updateTileRequests(const QSet<QGeoTileSpec> &tilesAdded, const QSet<QGeoTileSpec> &tilesRemoved);
 
 private Q_SLOTS:
@@ -91,7 +89,6 @@ Q_SIGNALS:
 
 protected:
     void timerEvent(QTimerEvent *event);
-    virtual bool init();
     QGeoTiledMappingManagerEngine::CacheAreas cacheHint() const;
 
 private:
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_;