From 79d35acae62bf28c37022b763b04e94f5e67bf6f Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Tue, 3 Nov 2009 16:47:55 +1000
Subject: Define and document deletion of QmlEngine QNetworkAccessManager

---
 src/declarative/qml/qmlengine.cpp | 14 +++++++-------
 tools/qmlviewer/qmlviewer.cpp     |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 7242a1d..c562e02 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -181,8 +181,6 @@ QmlEnginePrivate::~QmlEnginePrivate()
     typeNameClass = 0;
     delete listClass;
     listClass = 0;
-    delete networkAccessManager;
-    networkAccessManager = 0;
     delete nodeListClass;
     nodeListClass = 0;
     delete namedNodeMapClass;
@@ -336,14 +334,16 @@ QmlContext *QmlEngine::rootContext()
     Sets the common QNetworkAccessManager, \a network, used by all QML elements
     instantiated by this engine.
 
-    Any previously set manager is deleted and \a network is owned by the
-    QmlEngine.  This method should only be called before any QmlComponents are
-    instantiated.
+    If the parent of \a network is this engine, the engine takes ownership and
+    will delete it as needed. Otherwise, ownership remains with the caller.
+
+    This method should only be called before any QmlComponents are instantiated.
 */
 void QmlEngine::setNetworkAccessManager(QNetworkAccessManager *network)
 {
     Q_D(QmlEngine);
-    delete d->networkAccessManager;
+    if (d->networkAccessManager && d->networkAccessManager->parent() == this)
+        delete d->networkAccessManager;
     d->networkAccessManager = network;
 }
 
@@ -358,7 +358,7 @@ QNetworkAccessManager *QmlEngine::networkAccessManager() const
 {
     Q_D(const QmlEngine);
     if (!d->networkAccessManager)
-        d->networkAccessManager = new QNetworkAccessManager;
+        d->networkAccessManager = new QNetworkAccessManager(const_cast<QmlEngine*>(this));
     return d->networkAccessManager;
 }
 
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 248ff24..b9f3e67 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -249,7 +249,7 @@ private:
 
 class ConfiguredNetworkAccessManager : public QNetworkAccessManager {
 public:
-    ConfiguredNetworkAccessManager() { }
+    ConfiguredNetworkAccessManager(QObject *parent) : QNetworkAccessManager(parent) { }
 
     QNetworkReply *createRequest (Operation op, const QNetworkRequest &req, QIODevice * outgoingData)
     {
@@ -334,7 +334,7 @@ QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
     canvas->setAttribute(Qt::WA_OpaquePaintEvent);
     canvas->setAttribute(Qt::WA_NoSystemBackground);
     canvas->setContentResizable(!skin || !scaleSkin);
-    canvas->engine()->setNetworkAccessManager(new ConfiguredNetworkAccessManager);
+    canvas->engine()->setNetworkAccessManager(new ConfiguredNetworkAccessManager(canvas->engine()));
     canvas->setFocus();
 
     QObject::connect(canvas, SIGNAL(sceneResized(QSize)), this, SLOT(sceneResized(QSize)));
-- 
cgit v0.12