Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into master-integration

* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location:
  Def file fix for previous commit
  Fix location plugins to use given network access manager.

4 files changed, 12 insertions, 4 deletions

diff --git a/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
index 2b2842d550..3a0539bf6e 100755
--- a/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
@@ -50,6 +50,7 @@
 #include "qgeomapreply_nokia.h"
 #include "qgeotiledmapdata_nokia.h"
 #include "marclanguagecodes.h"
+#include "qlocationnetworkaccessmanagerfactory.h"
 
 #include <qgeotiledmaprequest.h>
 
@@ -212,7 +213,8 @@ QGeoMappingManagerEngineNokia::QGeoMappingManagerEngineNokia(const QMap<QString,
     modes << QGraphicsGeoMap::OnlineMode;
     setSupportedConnectivityModes(modes);
 
-    m_networkManager = new QNetworkAccessManager(this);
+    // Get manager from declarative factory or create a new one
+    m_networkManager = QLocationNetworkAccessManagerFactory::instance()->create(this);
 
     if (parameters.contains("mapping.proxy")) {
         QString proxy = parameters.value("mapping.proxy").toString();
diff --git a/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index cf448ef202..89d38e9f5d 100644
--- a/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -48,6 +48,7 @@
 
 #include "qgeoroutingmanagerengine_nokia.h"
 #include "qgeoroutereply_nokia.h"
+#include "qlocationnetworkaccessmanagerfactory.h"
 
 #include <QStringList>
 #include <QNetworkProxy>
@@ -61,7 +62,8 @@ QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(const QMap<QString,
         m_referer(QGeoServiceProviderFactoryNokia::defaultReferer),
         m_serviceDisabled(false)
 {
-    m_networkManager = new QNetworkAccessManager(this);
+    // Get manager from declarative factory or create a new one
+    m_networkManager = QLocationNetworkAccessManagerFactory::instance()->create(this);
 
     if (parameters.contains("routing.proxy")) {
         QString proxy = parameters.value("routing.proxy").toString();
diff --git a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
index 13d7276782..c5b703aa41 100644
--- a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
@@ -49,6 +49,7 @@
 #include "qgeosearchmanagerengine_nokia.h"
 #include "qgeosearchreply_nokia.h"
 #include "marclanguagecodes.h"
+#include "qlocationnetworkaccessmanagerfactory.h"
 
 #include <qgeoaddress.h>
 #include <qgeocoordinate.h>
@@ -62,7 +63,8 @@ QGeoSearchManagerEngineNokia::QGeoSearchManagerEngineNokia(const QMap<QString, Q
         m_token(QGeoServiceProviderFactoryNokia::defaultToken),
         m_referer(QGeoServiceProviderFactoryNokia::defaultReferer)
 {
-    m_networkManager = new QNetworkAccessManager(this);
+    // Get manager from declarative factory or create a new one
+    m_networkManager = QLocationNetworkAccessManagerFactory::instance()->create(this);
 
     if (parameters.contains("places.proxy")) {
         QString proxy = parameters.value("places.proxy").toString();
diff --git a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
index d072a91d0a..d842b814bb 100644
--- a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
@@ -51,6 +51,7 @@
 #include "qgeomappingmanagerengine_nokia.h"
 #include "qgeoboundingbox.h"
 #include "qgeocoordinate.h"
+#include "qlocationnetworkaccessmanagerfactory.h"
 
 #include <QNetworkAccessManager>
 #include <QNetworkProxy>
@@ -83,7 +84,8 @@ QGeoTiledMapDataNokia::QGeoTiledMapDataNokia(QGeoMappingManagerEngineNokia *engi
     watermark(":/images/watermark.png"),
     m_logoPosition(engine->logoPosition())
 {
-    m_networkManager = new QNetworkAccessManager(this);
+    // Get manager from declarative factory or create a new one
+    m_networkManager = QLocationNetworkAccessManagerFactory::instance()->create(this);
     connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), SLOT(copyrightReplyFinished(QNetworkReply*)));
 
     QString copyrightUrl = "http://";