Really run image reader in its own thread.

1 files changed, 1 insertions, 14 deletions

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index a33aea7..8b52684 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -122,7 +122,7 @@ QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
   contextClass(0), sharedContext(0), sharedScope(0), objectClass(0), valueTypeClass(0), 
   globalClass(0), cleanup(0), erroredBindings(0), inProgressCreations(0), 
   scriptEngine(this), workerScriptEngine(0), componentAttacheds(0), inBeginCreate(false), 
-  networkAccessManager(0), networkAccessManagerFactory(0), accessManagerValid(false),
+  networkAccessManager(0), networkAccessManagerFactory(0),
   typeManager(e), uniqueId(1)
 {
     globalClass = new QmlGlobalScriptClass(&scriptEngine);
@@ -412,12 +412,6 @@ QmlNetworkAccessManagerFactory *QmlEngine::networkAccessManagerFactory() const
     return d->networkAccessManagerFactory;
 }
 
-void QmlEngine::namInvalidated()
-{
-    Q_D(QmlEngine);
-    d->accessManagerValid = false;
-}
-
 /*!
     Returns a common QNetworkAccessManager which can be used by any QML element
     instantiated by this engine.
@@ -432,19 +426,12 @@ void QmlEngine::namInvalidated()
 QNetworkAccessManager *QmlEngine::networkAccessManager() const
 {
     Q_D(const QmlEngine);
-    if (!d->accessManagerValid) {
-        delete d->networkAccessManagerFactory;
-        d->networkAccessManagerFactory = 0;
-    }
     if (!d->networkAccessManager) {
         if (d->networkAccessManagerFactory) {
-            connect(d->networkAccessManagerFactory, SIGNAL(invalidated())
-                    , this, SLOT(namInvalidated()), Qt::UniqueConnection);
             d->networkAccessManager = d->networkAccessManagerFactory->create(const_cast<QmlEngine*>(this));
         } else {
             d->networkAccessManager = new QNetworkAccessManager(const_cast<QmlEngine*>(this));
         }
-        d->accessManagerValid = true;
     }
     return d->networkAccessManager;
 }