Fixes the threading issues with maps.

The threading is about to be reworked so that multiple maps can
make use of the same mapping manager engine, which will change the
way this works quite a bit.

That means that this change is effectively a temporary fix to
unblock the CI, although aspects of this change will most likely
reappear in the new version.

Change-Id: I34377e69c15ac8de350308b99d84f8bd121e145c
Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>

1 files changed, 12 insertions, 11 deletions

diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp
index e2ff4b40..ea115f7e 100644
--- a/src/location/maps/qgeomappingmanager.cpp
+++ b/src/location/maps/qgeomappingmanager.cpp
@@ -116,24 +116,28 @@ QGeoMappingManager::QGeoMappingManager(QGeoMappingManagerEngine *engine, QObject
             SIGNAL(queueFinished()),
             Qt::QueuedConnection);
 
+    connect(d_ptr->engine,
+            SIGNAL(initialized()),
+            this,
+            SIGNAL(initialized()));
+
+    d_ptr->engine->moveToThread(d_ptr->thread);
+
     connect(d_ptr->thread,
             SIGNAL(started()),
             d_ptr->engine,
-            SLOT(threadStarted()),
-            Qt::QueuedConnection);
+            SLOT(threadStarted()));
 
     connect(d_ptr->thread,
             SIGNAL(finished()),
             d_ptr->engine,
-            SLOT(threadFinished()),
-            Qt::QueuedConnection);
+            SLOT(threadFinished()));
 
     connect(d_ptr->engine,
-            SIGNAL(initialized()),
-            this,
-            SIGNAL(initialized()));
+            SIGNAL(destroyed()),
+            d_ptr->thread,
+            SLOT(deleteLater()));
 
-    d_ptr->engine->moveToThread(d_ptr->thread);
     QTimer::singleShot(0, d_ptr->thread, SLOT(start()));
 }
 
@@ -317,9 +321,6 @@ QGeoMappingManagerPrivate::QGeoMappingManagerPrivate()
 QGeoMappingManagerPrivate::~QGeoMappingManagerPrivate()
 {
     thread->quit();
-    if (engine)
-        engine->deleteLater();
-    thread->deleteLater();
 }
 
 #include "moc_qgeomappingmanager.cpp"