Simplify type management code

17 files changed, 1470 insertions, 1186 deletions

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index f044e1a..a6b0b34 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -41,7 +41,6 @@
 
 #include "private/qdeclarativecompiler_p.h"
 
-#include "private/qdeclarativecompositetypedata_p.h"
 #include "private/qdeclarativeparser_p.h"
 #include "private/qdeclarativescriptparser_p.h"
 #include "qdeclarativepropertyvaluesource.h"
@@ -562,7 +561,7 @@ void QDeclarativeCompiler::reset(QDeclarativeCompiledData *data)
     on a successful compiler.
 */
 bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine,
-                                   QDeclarativeCompositeTypeData *unit,
+                                   QDeclarativeTypeData *unit,
                                    QDeclarativeCompiledData *out)
 {
     exceptions.clear();
@@ -573,10 +572,15 @@ bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine,
     output = out;
 
     // Compile types
-    for (int ii = 0; ii < unit->types.count(); ++ii) {
-        QDeclarativeCompositeTypeData::TypeReference &tref = unit->types[ii];
+    const QList<QDeclarativeTypeData::TypeReference>  &resolvedTypes = unit->resolvedTypes();
+    QList<QDeclarativeScriptParser::TypeReference *> referencedTypes = unit->parser().referencedTypes();
+
+    for (int ii = 0; ii < resolvedTypes.count(); ++ii) {
         QDeclarativeCompiledData::TypeReference ref;
-        QDeclarativeScriptParser::TypeReference *parserRef = unit->data.referencedTypes().at(ii);
+
+        const QDeclarativeTypeData::TypeReference &tref = resolvedTypes.at(ii);
+        QDeclarativeScriptParser::TypeReference *parserRef = referencedTypes.at(ii);
+
         if (tref.type) {
             ref.type = tref.type;
             if (!ref.type->isCreatable()) {
@@ -585,33 +589,16 @@ bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine,
                     err = tr( "Element is not creatable.");
                 COMPILE_EXCEPTION(parserRef->refObjects.first(), err);
             }
-        } else if (tref.unit) {
-            ref.component = tref.unit->toComponent(engine);
-
-            if (ref.component->isError()) {
-                QDeclarativeError error;
-                error.setUrl(output->url);
-                error.setDescription(QLatin1String("Unable to create type ") +
-                                     parserRef->name);
-                if (!parserRef->refObjects.isEmpty()) {
-                    QDeclarativeParser::Object *parserObject = parserRef->refObjects.first();
-                    error.setLine(parserObject->location.start.line);
-                    error.setColumn(parserObject->location.start.column);
-                }
-
-                exceptions << error;
-                exceptions << ref.component->errors();
-                reset(out);
-                return false;
-            }
-            ref.ref = tref.unit;
+        } else if (tref.typeData) {
+            ref.component = tref.typeData->component();
+            ref.ref = tref.typeData;
             ref.ref->addref();
         }
         ref.className = parserRef->name.toUtf8();
         out->types << ref;
     }
 
-    Object *root = unit->data.tree();
+    Object *root = unit->parser().tree();
     Q_ASSERT(root);
 
     this->engine = engine;
@@ -664,17 +651,17 @@ void QDeclarativeCompiler::compileTree(Object *tree)
     QHash<QString, Object::ScriptBlock> importedScripts;
     QStringList importedScriptIndexes;
 
-    for (int ii = 0; ii < unit->scripts.count(); ++ii) {
-        QString scriptCode = QString::fromUtf8(unit->scripts.at(ii).resource->data);
-        Object::ScriptBlock::Pragmas pragmas = QDeclarativeScriptParser::extractPragmas(scriptCode);
+    foreach (const QDeclarativeTypeData::ScriptReference &script, unit->resolvedScripts()) {
+        QString scriptCode = script.script->scriptSource();
+        Object::ScriptBlock::Pragmas pragmas = script.script->pragmas();
 
-        Q_ASSERT(!importedScripts.contains(unit->scripts.at(ii).qualifier));
+        Q_ASSERT(!importedScripts.contains(script.qualifier));
 
         if (!scriptCode.isEmpty()) {
-            Object::ScriptBlock &scriptBlock = importedScripts[unit->scripts.at(ii).qualifier];
+            Object::ScriptBlock &scriptBlock = importedScripts[script.qualifier];
 
             scriptBlock.code = scriptCode;
-            scriptBlock.file = unit->scripts.at(ii).resource->url;
+            scriptBlock.file = script.script->finalUrl().toString();
             scriptBlock.pragmas = pragmas;
         }
     }
@@ -704,7 +691,7 @@ void QDeclarativeCompiler::compileTree(Object *tree)
     for (int ii = 0; ii < importedScriptIndexes.count(); ++ii) 
         output->importCache->add(importedScriptIndexes.at(ii), ii);
 
-    unit->imports.populateCache(output->importCache, engine);
+    unit->imports().populateCache(output->importCache, engine);
 
     Q_ASSERT(tree->metatype);
 
@@ -1404,7 +1391,7 @@ bool QDeclarativeCompiler::buildProperty(QDeclarativeParser::Property *prop,
 
         QDeclarativeType *type = 0;
         QDeclarativeImportedNamespace *typeNamespace = 0;
-        unit->imports.resolveType(prop->name, &type, 0, 0, 0, &typeNamespace);
+        unit->imports().resolveType(prop->name, &type, 0, 0, 0, &typeNamespace);
 
         if (typeNamespace) {
             // ### We might need to indicate that this property is a namespace 
@@ -1512,7 +1499,7 @@ bool QDeclarativeCompiler::buildPropertyInNamespace(QDeclarativeImportedNamespac
         // Setup attached property data
 
         QDeclarativeType *type = 0;
-        unit->imports.resolveType(ns, prop->name, &type, 0, 0, 0);
+        unit->imports().resolveType(ns, prop->name, &type, 0, 0, 0);
 
         if (!type || !type->attachedPropertiesType()) 
             COMPILE_EXCEPTION(prop, tr("Non-existent attached object"));
@@ -2139,7 +2126,7 @@ bool QDeclarativeCompiler::testQualifiedEnumAssignment(const QMetaProperty &prop
 
     QString typeName = parts.at(0);
     QDeclarativeType *type = 0;
-    unit->imports.resolveType(typeName.toUtf8(), &type, 0, 0, 0, 0);
+    unit->imports().resolveType(typeName.toUtf8(), &type, 0, 0, 0, 0);
 
     if (!type || obj->typeName != type->qmlTypeName())
         return true;
@@ -2166,7 +2153,7 @@ int QDeclarativeCompiler::evaluateEnum(const QByteArray& script) const
     int dot = script.indexOf('.');
     if (dot > 0) {
         QDeclarativeType *type = 0;
-        unit->imports.resolveType(script.left(dot), &type, 0, 0, 0, 0);
+        unit->imports().resolveType(script.left(dot), &type, 0, 0, 0, 0);
         if (!type)
             return -1;
         const QMetaObject *mo = type->metaObject();
@@ -2184,7 +2171,7 @@ int QDeclarativeCompiler::evaluateEnum(const QByteArray& script) const
 const QMetaObject *QDeclarativeCompiler::resolveType(const QByteArray& name) const
 {
     QDeclarativeType *qmltype = 0;
-    if (!unit->imports.resolveType(name, &qmltype, 0, 0, 0, 0)) 
+    if (!unit->imports().resolveType(name, &qmltype, 0, 0, 0, 0)) 
         return 0;
     if (!qmltype)
         return 0;
@@ -2342,16 +2329,18 @@ bool QDeclarativeCompiler::buildDynamicMeta(QDeclarativeParser::Object *obj, Dyn
                 QByteArray customTypeName;
                 QDeclarativeType *qmltype = 0;
                 QUrl url;
-                if (!unit->imports.resolveType(p.customType, &qmltype, &url, 0, 0, 0)) 
+                if (!unit->imports().resolveType(p.customType, &qmltype, &url, 0, 0, 0)) 
                     COMPILE_EXCEPTION(&p, tr("Invalid property type"));
 
                 if (!qmltype) {
-                    QDeclarativeCompositeTypeData *tdata = enginePrivate->typeManager.get(url);
+                    QDeclarativeTypeData *tdata = enginePrivate->typeLoader.get(url);
                     Q_ASSERT(tdata);
-                    Q_ASSERT(tdata->status == QDeclarativeCompositeTypeData::Complete);
+                    Q_ASSERT(tdata->isComplete());
 
-                    QDeclarativeCompiledData *data = tdata->toCompiledComponent(engine);
+                    QDeclarativeCompiledData *data = tdata->compiledData();
                     customTypeName = data->root->className();
+                    data->release();
+                    tdata->release();
                 } else {
                     customTypeName = qmltype->typeName();
                 }
@@ -2746,7 +2735,7 @@ bool QDeclarativeCompiler::completeComponentBuild()
         expr.context = binding.bindingContext.object;
         expr.property = binding.property;
         expr.expression = binding.expression;
-        expr.imports = unit->imports;
+        expr.imports = unit->imports();
 
         int index = bindingCompiler.compile(expr, enginePrivate);
         if (index != -1) {
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
index 49dc53f..89eef09 100644
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -56,13 +56,13 @@
 #include "qdeclarative.h"
 #include "qdeclarativeerror.h"
 #include "private/qdeclarativeinstruction_p.h"
-#include "private/qdeclarativecompositetypemanager_p.h"
 #include "private/qdeclarativeparser_p.h"
 #include "private/qdeclarativeengine_p.h"
 #include "private/qbitfield_p.h"
 #include "private/qdeclarativepropertycache_p.h"
 #include "private/qdeclarativeintegercache_p.h"
 #include "private/qdeclarativetypenamecache_p.h"
+#include "private/qdeclarativetypeloader_p.h"
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qset.h>
@@ -152,7 +152,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeCompiler
 public:
     QDeclarativeCompiler();
 
-    bool compile(QDeclarativeEngine *, QDeclarativeCompositeTypeData *, QDeclarativeCompiledData *);
+    bool compile(QDeclarativeEngine *, QDeclarativeTypeData *, QDeclarativeCompiledData *);
 
     bool isError() const;
     QList<QDeclarativeError> errors() const;
@@ -338,7 +338,7 @@ private:
     QDeclarativeEngine *engine;
     QDeclarativeEnginePrivate *enginePrivate;
     QDeclarativeParser::Object *unitRoot;
-    QDeclarativeCompositeTypeData *unit;
+    QDeclarativeTypeData *unit;
 };
 QT_END_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index d2d1f19..75bb5db 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -44,7 +44,6 @@
 
 #include "private/qdeclarativecompiler_p.h"
 #include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativecompositetypedata_p.h"
 #include "private/qdeclarativeengine_p.h"
 #include "private/qdeclarativevme_p.h"
 #include "qdeclarative.h"
@@ -197,7 +196,7 @@ class QByteArray;
     \value Error An error has occurred.  Call errors() to retrieve a list of \{QDeclarativeError}{errors}.
 */
 
-void QDeclarativeComponentPrivate::typeDataReady()
+void QDeclarativeComponentPrivate::typeDataReady(QDeclarativeTypeData *)
 {
     Q_Q(QDeclarativeComponent);
 
@@ -209,28 +208,25 @@ void QDeclarativeComponentPrivate::typeDataReady()
     emit q->statusChanged(q->status());
 }
 
-void QDeclarativeComponentPrivate::updateProgress(qreal p)
+void QDeclarativeComponentPrivate::typeDataProgress(QDeclarativeTypeData *, qreal p)
 {
     Q_Q(QDeclarativeComponent);
 
     progress = p;
+
     emit q->progressChanged(p);
 }
 
-void QDeclarativeComponentPrivate::fromTypeData(QDeclarativeCompositeTypeData *data)
+void QDeclarativeComponentPrivate::fromTypeData(QDeclarativeTypeData *data)
 {
-    url = data->imports.baseUrl();
-    QDeclarativeCompiledData *c = data->toCompiledComponent(engine);
+    url = data->finalUrl();
+    QDeclarativeCompiledData *c = data->compiledData();
 
     if (!c) {
-        Q_ASSERT(data->status == QDeclarativeCompositeTypeData::Error);
-
-        state.errors = data->errors;
-
+        Q_ASSERT(data->isError());
+        state.errors = data->errors();
     } else {
-
         cc = c;
-
     }
 
     data->release();
@@ -239,7 +235,7 @@ void QDeclarativeComponentPrivate::fromTypeData(QDeclarativeCompositeTypeData *d
 void QDeclarativeComponentPrivate::clear()
 {
     if (typeData) {
-        typeData->remWaiter(this);
+        typeData->unregisterCallback(this);
         typeData->release();
         typeData = 0;
     }
@@ -271,7 +267,7 @@ QDeclarativeComponent::~QDeclarativeComponent()
     }
 
     if (d->typeData) {
-        d->typeData->remWaiter(d);
+        d->typeData->unregisterCallback(d);
         d->typeData->release();
     }
     if (d->cc)
@@ -443,19 +439,13 @@ void QDeclarativeComponent::setData(const QByteArray &data, const QUrl &url)
 
     d->url = url;
 
-    QDeclarativeCompositeTypeData *typeData = 
-        QDeclarativeEnginePrivate::get(d->engine)->typeManager.getImmediate(data, url);
+    QDeclarativeTypeData *typeData = QDeclarativeEnginePrivate::get(d->engine)->typeLoader.get(data, url);
     
-    if (typeData->status == QDeclarativeCompositeTypeData::Waiting
-     || typeData->status == QDeclarativeCompositeTypeData::WaitingResources)
-    {
-        d->typeData = typeData;
-        d->typeData->addWaiter(d);
-
-    } else {
-
+    if (typeData->isCompleteOrError()) {
         d->fromTypeData(typeData);
-
+    } else {
+        d->typeData = typeData;
+        d->typeData->registerCallback(d);
     }
 
     d->progress = 1.0;
@@ -501,18 +491,15 @@ void QDeclarativeComponent::loadUrl(const QUrl &url)
         return;
     }
 
-    QDeclarativeCompositeTypeData *data = 
-        QDeclarativeEnginePrivate::get(d->engine)->typeManager.get(d->url);
+    QDeclarativeTypeData *data = QDeclarativeEnginePrivate::get(d->engine)->typeLoader.get(d->url);
 
-    if (data->status == QDeclarativeCompositeTypeData::Waiting
-     || data->status == QDeclarativeCompositeTypeData::WaitingResources)
-    {
-        d->typeData = data;
-        d->typeData->addWaiter(d);
-        d->progress = data->progress;
-    } else {
+    if (data->isCompleteOrError()) {
         d->fromTypeData(data);
         d->progress = 1.0;
+    } else {
+        d->typeData = data;
+        d->typeData->registerCallback(d);
+        d->progress = data->progress();
     }
 
     emit statusChanged(status());
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index 1d1fca7..fd9cb2b 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -117,6 +117,7 @@ private:
     Q_DISABLE_COPY(QDeclarativeComponent)
     friend class QDeclarativeVME;
     friend class QDeclarativeCompositeTypeData;
+    friend class QDeclarativeTypeData;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h
index 2a7d633..1b1454b 100644
--- a/src/declarative/qml/qdeclarativecomponent_p.h
+++ b/src/declarative/qml/qdeclarativecomponent_p.h
@@ -56,7 +56,7 @@
 #include "qdeclarativecomponent.h"
 
 #include "private/qdeclarativeengine_p.h"
-#include "private/qdeclarativecompositetypemanager_p.h"
+#include "private/qdeclarativetypeloader_p.h"
 #include "private/qbitfield_p.h"
 #include "qdeclarativeerror.h"
 #include "qdeclarative.h"
@@ -74,7 +74,7 @@ class QDeclarativeEngine;
 class QDeclarativeCompiledData;
 
 class QDeclarativeComponentAttached;
-class QDeclarativeComponentPrivate : public QObjectPrivate
+class QDeclarativeComponentPrivate : public QObjectPrivate, public QDeclarativeTypeData::TypeDataCallback
 {
     Q_DECLARE_PUBLIC(QDeclarativeComponent)
         
@@ -85,11 +85,11 @@ public:
     QObject *beginCreate(QDeclarativeContextData *, const QBitField &);
     void completeCreate();
 
-    QDeclarativeCompositeTypeData *typeData;
-    void typeDataReady();
-    void updateProgress(qreal);
+    QDeclarativeTypeData *typeData;
+    virtual void typeDataReady(QDeclarativeTypeData *);
+    virtual void typeDataProgress(QDeclarativeTypeData *, qreal);
     
-    void fromTypeData(QDeclarativeCompositeTypeData *data);
+    void fromTypeData(QDeclarativeTypeData *data);
 
     QUrl url;
     qreal progress;
diff --git a/src/declarative/qml/qdeclarativecompositetypedata_p.h b/src/declarative/qml/qdeclarativecompositetypedata_p.h
deleted file mode 100644
index a0e4cc2..0000000
--- a/src/declarative/qml/qdeclarativecompositetypedata_p.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVECOMPOSITETYPEDATA_P_H
-#define QDECLARATIVECOMPOSITETYPEDATA_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "private/qdeclarativeengine_p.h"
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeCompositeTypeResource;
-class QDeclarativeCompositeTypeData : public QDeclarativeRefCount
-{
-public:
-    QDeclarativeCompositeTypeData();
-    virtual ~QDeclarativeCompositeTypeData();
-
-    enum Status {
-        Invalid,
-        Complete,
-        Error,
-        Waiting,
-        WaitingResources
-    };
-    Status status;
-    enum ErrorType {
-        NoError,
-        AccessError,
-        GeneralError
-    };
-    ErrorType errorType;
-
-    QList<QDeclarativeError> errors;
-
-    QDeclarativeImports imports;
-
-    QList<QDeclarativeCompositeTypeData *> dependants;
-
-    // Return a QDeclarativeComponent if the QDeclarativeCompositeTypeData is not in the Waiting
-    // state.  The QDeclarativeComponent is owned by the QDeclarativeCompositeTypeData, so a
-    // reference should be kept to keep the QDeclarativeComponent alive.
-    QDeclarativeComponent *toComponent(QDeclarativeEngine *);
-    // Return a QDeclarativeCompiledData if possible, or 0 if an error
-    // occurs
-    QDeclarativeCompiledData *toCompiledComponent(QDeclarativeEngine *);
-
-    struct TypeReference
-    {
-        TypeReference();
-
-        QDeclarativeType *type;
-        QDeclarativeCompositeTypeData *unit;
-    };
-
-    struct ScriptReference 
-    {
-        ScriptReference();
-
-        QString qualifier;
-        QDeclarativeCompositeTypeResource *resource;
-    };
-
-    QList<TypeReference> types;
-    QList<ScriptReference> scripts;
-    QList<QDeclarativeCompositeTypeResource *> resources;
-
-    // Add or remove p as a waiter.  When the QDeclarativeCompositeTypeData becomes
-    // ready, the QDeclarativeComponentPrivate::typeDataReady() method will be invoked on
-    // p.  The waiter is automatically removed when the typeDataReady() method
-    // is invoked, so there is no need to call remWaiter() in this case.
-    void addWaiter(QDeclarativeComponentPrivate *p);
-    void remWaiter(QDeclarativeComponentPrivate *p);
-
-    qreal progress;
-
-private:
-    friend class QDeclarativeCompositeTypeManager;
-    friend class QDeclarativeCompiler;
-    friend class QDeclarativeDomDocument;
-
-    QDeclarativeScriptParser data;
-    QList<QDeclarativeComponentPrivate *> waiters;
-    QDeclarativeComponent *component;
-    QDeclarativeCompiledData *compiledComponent;
-};
-
-class QDeclarativeCompositeTypeResource : public QDeclarativeRefCount
-{
-public:
-    QDeclarativeCompositeTypeResource();
-    virtual ~QDeclarativeCompositeTypeResource();
-
-    enum Status {
-        Invalid,
-        Complete,
-        Error,
-        Waiting
-    };
-    Status status;
-
-    QList<QDeclarativeCompositeTypeData *> dependants;
-
-    QString url;
-    QByteArray data;
-};
-
-QT_END_NAMESPACE
-
-#endif // QDECLARATIVECOMPOSITETYPEDATA_P_H
-
diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp
deleted file mode 100644
index cc8f887..0000000
--- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp
+++ /dev/null
@@ -1,778 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "private/qdeclarativecompositetypemanager_p.h"
-
-#include "private/qdeclarativecompositetypedata_p.h"
-#include "private/qdeclarativescriptparser_p.h"
-#include "qdeclarativeengine.h"
-#include "private/qdeclarativeengine_p.h"
-#include "qdeclarativecomponent.h"
-#include "private/qdeclarativecomponent_p.h"
-#include "private/qdeclarativecompiler_p.h"
-
-#include <QtNetwork/qnetworkreply.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qfile.h>
-
-QT_BEGIN_NAMESPACE
-
-QDeclarativeCompositeTypeData::QDeclarativeCompositeTypeData()
-: status(Invalid), errorType(NoError), component(0), compiledComponent(0)
-{
-}
-
-QDeclarativeCompositeTypeData::~QDeclarativeCompositeTypeData()
-{
-    for (int ii = 0; ii < dependants.count(); ++ii)
-        dependants.at(ii)->release();
-
-    for (int ii = 0; ii < resources.count(); ++ii)
-        resources.at(ii)->release();
-
-    if (compiledComponent)
-        compiledComponent->release();
-
-    if (component) 
-        delete component;
-}
-
-QDeclarativeCompositeTypeResource::QDeclarativeCompositeTypeResource()
-{
-}
-
-QDeclarativeCompositeTypeResource::~QDeclarativeCompositeTypeResource()
-{
-    for (int ii = 0; ii < dependants.count(); ++ii)
-        dependants.at(ii)->release();
-}
-
-void QDeclarativeCompositeTypeData::addWaiter(QDeclarativeComponentPrivate *p)
-{
-    waiters << p;
-}
-
-void QDeclarativeCompositeTypeData::remWaiter(QDeclarativeComponentPrivate *p)
-{
-    waiters.removeAll(p);
-}
-
-QDeclarativeComponent *QDeclarativeCompositeTypeData::toComponent(QDeclarativeEngine *engine)
-{
-    if (!component) {
-
-        QDeclarativeCompiledData *cc = toCompiledComponent(engine);
-        if (cc) {
-            component = new QDeclarativeComponent(engine, cc, -1, -1, 0);
-            cc->release();
-        } else {
-            component = new QDeclarativeComponent(engine, 0);
-            component->d_func()->url = imports.baseUrl();
-            component->d_func()->state.errors = errors;
-        }
-
-    }
-
-    return component;
-}
-
-QDeclarativeCompiledData *
-QDeclarativeCompositeTypeData::toCompiledComponent(QDeclarativeEngine *engine)
-{
-    if (status == Complete && !compiledComponent) {
-
-        // Build script imports
-        foreach (const QDeclarativeScriptParser::Import &import, data.imports()) {
-            if (import.type == QDeclarativeScriptParser::Import::Script) {
-                QString url = imports.baseUrl().resolved(QUrl(import.uri)).toString();
-
-                ScriptReference ref;
-                ref.qualifier = import.qualifier;
-
-                for (int ii = 0; ii < resources.count(); ++ii) {
-                    if (resources.at(ii)->url == url) {
-                        ref.resource = resources.at(ii);
-                        break;
-                    }
-                }
-
-                Q_ASSERT(ref.resource);
-
-                scripts << ref;
-            }
-        }
-
-        compiledComponent = new QDeclarativeCompiledData(engine);
-        compiledComponent->url = imports.baseUrl();
-        compiledComponent->name = compiledComponent->url.toString();
-
-        QDeclarativeCompiler compiler;
-        if (!compiler.compile(engine, this, compiledComponent)) {
-            status = Error;
-            errors = compiler.errors();
-            compiledComponent->release();
-            compiledComponent = 0;
-        }
-
-        // Data is no longer needed once we have a compiled component
-        data.clear();
-    }
-
-    if (compiledComponent)
-        compiledComponent->addref();
-
-    return compiledComponent;
-}
-
-QDeclarativeCompositeTypeData::TypeReference::TypeReference()
-: type(0), unit(0)
-{
-}
-
-QDeclarativeCompositeTypeData::ScriptReference::ScriptReference()
-: resource(0)
-{
-}
-
-QDeclarativeCompositeTypeManager::QDeclarativeCompositeTypeManager(QDeclarativeEngine *e)
-: engine(e), redirectCount(0)
-{
-}
-
-QDeclarativeCompositeTypeManager::~QDeclarativeCompositeTypeManager()
-{
-    for (Components::Iterator iter = components.begin(); iter != components.end();) {
-        (*iter)->release();
-        iter = components.erase(iter);
-    }
-    for (Resources::Iterator iter = resources.begin(); iter != resources.end();) {
-        (*iter)->release();
-        iter = resources.erase(iter);
-    }
-}
-
-QDeclarativeCompositeTypeData *QDeclarativeCompositeTypeManager::get(const QUrl &url)
-{
-    Redirects::Iterator redir = redirects.find(url);
-    if (redir != redirects.end())
-        return get(*redir);
-
-    QDeclarativeCompositeTypeData *unit = components.value(url);
-
-    if (!unit) {
-        unit = new QDeclarativeCompositeTypeData;
-        unit->status = QDeclarativeCompositeTypeData::Waiting;
-        unit->progress = 0.0;
-        unit->imports.setBaseUrl(url);
-        components.insert(url, unit);
-
-        loadSource(unit);
-    }
-
-    unit->addref();
-    return unit;
-}
-
-QDeclarativeCompositeTypeData *
-QDeclarativeCompositeTypeManager::getImmediate(const QByteArray &data, const QUrl &url)
-{
-    QDeclarativeCompositeTypeData *unit = new QDeclarativeCompositeTypeData;
-    unit->status = QDeclarativeCompositeTypeData::Waiting;
-    unit->imports.setBaseUrl(url);
-    setData(unit, data, url);
-    return unit;
-}
-
-void QDeclarativeCompositeTypeManager::clearCache()
-{
-    for (Components::Iterator iter = components.begin(); iter != components.end();) {
-        if ((*iter)->status != QDeclarativeCompositeTypeData::Waiting) {
-            (*iter)->release();
-            iter = components.erase(iter);
-        } else {
-            ++iter;
-        }
-    }
-
-    for (Resources::Iterator iter = resources.begin(); iter != resources.end();) {
-        if ((*iter)->status != QDeclarativeCompositeTypeResource::Waiting) {
-            (*iter)->release();
-            iter = resources.erase(iter);
-        } else {
-            ++iter;
-        }
-    }
-}
-
-#define TYPEMANAGER_MAXIMUM_REDIRECT_RECURSION 16
-
-void QDeclarativeCompositeTypeManager::replyFinished()
-{
-    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
-
-    QDeclarativeCompositeTypeData *unit = components.value(reply->url());
-    Q_ASSERT(unit);
-
-    redirectCount++;
-    if (redirectCount < TYPEMANAGER_MAXIMUM_REDIRECT_RECURSION) {
-        QVariant redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
-        if (redirect.isValid()) {
-            QUrl url = reply->url().resolved(redirect.toUrl());
-            redirects.insert(reply->url(),url);
-            unit->imports.setBaseUrl(url);
-            components.remove(reply->url());
-            components.insert(url, unit);
-            reply->deleteLater();
-            reply = engine->networkAccessManager()->get(QNetworkRequest(url));
-            QObject::connect(reply, SIGNAL(finished()),
-                             this, SLOT(replyFinished()));
-            QObject::connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
-                             this, SLOT(requestProgress(qint64,qint64)));
-            return;
-        }
-    }
-    redirectCount = 0;
-
-    if (reply->error() != QNetworkReply::NoError) {
-        QString errorDescription;
-        // ### - Fill in error
-        errorDescription = QLatin1String("Network error for URL ") + 
-                      reply->url().toString();
-
-        unit->status = QDeclarativeCompositeTypeData::Error;
-        // ### FIXME
-        QDeclarativeError error;
-        error.setDescription(errorDescription);
-        unit->errorType = QDeclarativeCompositeTypeData::AccessError;
-        unit->errors << error;
-        doComplete(unit);
-
-    } else {
-        QByteArray data = reply->readAll();
-
-        setData(unit, data, reply->url());
-    }
-
-    reply->deleteLater();
-}
-
-void QDeclarativeCompositeTypeManager::resourceReplyFinished()
-{
-    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
-
-    QDeclarativeCompositeTypeResource *resource = resources.value(reply->url());
-    Q_ASSERT(resource);
-
-    redirectCount++;
-    if (redirectCount < TYPEMANAGER_MAXIMUM_REDIRECT_RECURSION) {
-        QVariant redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
-        if (redirect.isValid()) {
-            QUrl url = reply->url().resolved(redirect.toUrl());
-            redirects.insert(reply->url(),url);
-            resource->url = url.toString();
-            resources.remove(reply->url());
-            resources.insert(url, resource);
-            reply->deleteLater();
-            reply = engine->networkAccessManager()->get(QNetworkRequest(url));
-            QObject::connect(reply, SIGNAL(finished()),
-                             this, SLOT(resourceReplyFinished()));
-            return;
-        }
-    }
-    redirectCount = 0;
-
-    if (reply->error() != QNetworkReply::NoError) {
-
-        resource->status = QDeclarativeCompositeTypeResource::Error;
-
-    } else {
-
-        resource->status = QDeclarativeCompositeTypeResource::Complete;
-        resource->data = reply->readAll();
-
-    }
-
-    doComplete(resource);
-    reply->deleteLater();
-}
-
-void QDeclarativeCompositeTypeManager::loadResource(QDeclarativeCompositeTypeResource *resource)
-{
-    QUrl url(resource->url);
-
-    QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url);
-    if (!lf.isEmpty()) {
-
-        QFile file(lf);
-        if (file.open(QFile::ReadOnly)) {
-            resource->data = file.readAll();
-            resource->status = QDeclarativeCompositeTypeResource::Complete;
-        } else {
-            resource->status = QDeclarativeCompositeTypeResource::Error;
-        }
-    } else if (url.scheme().isEmpty()) {
-
-        // We can't open this, so just declare as an error
-        resource->status = QDeclarativeCompositeTypeResource::Error;
-    } else {
-
-        QNetworkReply *reply = 
-            engine->networkAccessManager()->get(QNetworkRequest(url));
-        QObject::connect(reply, SIGNAL(finished()),
-                         this, SLOT(resourceReplyFinished()));
-
-    }
-}
-
-void QDeclarativeCompositeTypeManager::loadSource(QDeclarativeCompositeTypeData *unit)
-{
-    QUrl url(unit->imports.baseUrl());
-
-    QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url);
-    if (!lf.isEmpty()) {
-
-        QFile file(lf);
-        if (file.open(QFile::ReadOnly)) {
-            QByteArray data = file.readAll();
-            setData(unit, data, url);
-            return; // success
-        }
-    } else if (!url.scheme().isEmpty()) {
-        QNetworkReply *reply = 
-            engine->networkAccessManager()->get(QNetworkRequest(url));
-        QObject::connect(reply, SIGNAL(finished()),
-                         this, SLOT(replyFinished()));
-        QObject::connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
-                         this, SLOT(requestProgress(qint64,qint64)));
-        return; // waiting
-    }
-
-    // error happened
-    QString errorDescription;
-    // ### - Fill in error
-    errorDescription = QLatin1String("File error for URL ") + url.toString();
-    unit->status = QDeclarativeCompositeTypeData::Error;
-    // ### FIXME
-    QDeclarativeError error;
-    error.setDescription(errorDescription);
-    unit->errorType = QDeclarativeCompositeTypeData::AccessError;
-    unit->errors << error;
-    doComplete(unit);
-}
-
-void QDeclarativeCompositeTypeManager::requestProgress(qint64 received, qint64 total)
-{
-    if (total <= 0)
-        return;
-    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
-
-    QDeclarativeCompositeTypeData *unit = components.value(reply->url());
-    Q_ASSERT(unit);
-
-    unit->progress = qreal(received)/total;
-
-    foreach (QDeclarativeComponentPrivate *comp, unit->waiters)
-        comp->updateProgress(unit->progress);
-}
-
-void QDeclarativeCompositeTypeManager::setData(QDeclarativeCompositeTypeData *unit, 
-                                     const QByteArray &data,
-                                     const QUrl &url)
-{
-    bool ok = true;
-    if (!unit->data.parse(data, url)) {
-        ok = false;
-        unit->errors << unit->data.errors();
-    }
-
-    if (ok) {
-        compile(unit);
-    } else {
-        unit->status = QDeclarativeCompositeTypeData::Error;
-        unit->errorType = QDeclarativeCompositeTypeData::GeneralError;
-        doComplete(unit);
-    }
-}
-
-void QDeclarativeCompositeTypeManager::doComplete(QDeclarativeCompositeTypeData *unit)
-{
-    for (int ii = 0; ii < unit->dependants.count(); ++ii) {
-        checkComplete(unit->dependants.at(ii));
-        unit->dependants.at(ii)->release();
-    }
-    unit->dependants.clear();
-
-    while(!unit->waiters.isEmpty()) {
-        QDeclarativeComponentPrivate *p = unit->waiters.takeFirst();
-        p->typeDataReady();
-    }
-}
-
-void QDeclarativeCompositeTypeManager::doComplete(QDeclarativeCompositeTypeResource *resource)
-{
-    for (int ii = 0; ii < resource->dependants.count(); ++ii) {
-        checkComplete(resource->dependants.at(ii));
-        resource->dependants.at(ii)->release();
-    }
-    resource->dependants.clear();
-}
-
-void QDeclarativeCompositeTypeManager::checkComplete(QDeclarativeCompositeTypeData *unit)
-{
-    if (unit->status != QDeclarativeCompositeTypeData::Waiting
-     && unit->status != QDeclarativeCompositeTypeData::WaitingResources)
-        return;
-
-    int waiting = 0;
-    for (int ii = 0; ii < unit->resources.count(); ++ii) {
-        QDeclarativeCompositeTypeResource *r = unit->resources.at(ii);
-
-        if (!r)
-            continue;
-
-        if (r->status == QDeclarativeCompositeTypeResource::Error) {
-            unit->status = QDeclarativeCompositeTypeData::Error;
-            QDeclarativeError error;
-            error.setUrl(unit->imports.baseUrl());
-            error.setDescription(tr("Resource %1 unavailable").arg(r->url));
-            unit->errors << error;
-            doComplete(unit);
-            return;
-        } else if (r->status == QDeclarativeCompositeTypeResource::Waiting) {
-            waiting++;
-        }
-    }
-
-    if (waiting == 0) {
-        if (unit->status == QDeclarativeCompositeTypeData::WaitingResources) {
-            waiting += resolveTypes(unit);
-            if (unit->status != QDeclarativeCompositeTypeData::Error) {
-                if (waiting)
-                    unit->status = QDeclarativeCompositeTypeData::Waiting;
-            } else {
-                return;
-            }
-        } else {
-            for (int ii = 0; ii < unit->types.count(); ++ii) {
-                QDeclarativeCompositeTypeData *u = unit->types.at(ii).unit;
-
-                if (!u)
-                    continue;
-
-                if (u->status == QDeclarativeCompositeTypeData::Error) {
-                    unit->status = QDeclarativeCompositeTypeData::Error;
-                    unit->errors = u->errors;
-                    doComplete(unit);
-                    return;
-                } else if (u->status == QDeclarativeCompositeTypeData::Waiting
-                        || u->status == QDeclarativeCompositeTypeData::WaitingResources)
-                {
-                    waiting++;
-                }
-            }
-        }
-    }
-
-    if (!waiting) {
-        unit->status = QDeclarativeCompositeTypeData::Complete;
-        doComplete(unit);
-    }
-}
-
-int QDeclarativeCompositeTypeManager::resolveTypes(QDeclarativeCompositeTypeData *unit)
-{
-    // not called until all resources are loaded (they include import URLs)
-    int waiting = 0;
-
-    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
-    QDeclarativeImportDatabase *importDatabase = &ep->importDatabase;
-
-    // For local urls, add an implicit import "." as first (most overridden) lookup. 
-    // This will also trigger the loading of the qmldir and the import of any native 
-    // types from available plugins.
-    {
-        QDeclarativeDirComponents qmldircomponentsnetwork;
-        if (QDeclarativeCompositeTypeResource *resource
-            = resources.value(unit->imports.baseUrl().resolved(QUrl(QLatin1String("./qmldir"))))) {
-            QDeclarativeDirParser parser;
-            parser.setSource(QString::fromUtf8(resource->data));
-            parser.parse();
-            qmldircomponentsnetwork = parser.components();
-        }
-
-        unit->imports.addImport(importDatabase, 
-                                QLatin1String("."), QString(), -1, -1, QDeclarativeScriptParser::Import::File, 
-                                qmldircomponentsnetwork,
-                                0); // error ignored (just means no fallback)
-    }
-
-
-    foreach (const QDeclarativeScriptParser::Import &imp, unit->data.imports()) {
-        QDeclarativeDirComponents qmldircomponentsnetwork;
-        if (imp.type == QDeclarativeScriptParser::Import::Script)
-            continue;
-
-        if (imp.type == QDeclarativeScriptParser::Import::File && imp.qualifier.isEmpty()) {
-            QString importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir"))).toString();
-            for (int ii = 0; ii < unit->resources.count(); ++ii) {
-                if (unit->resources.at(ii)->url == importUrl) {
-                    QDeclarativeDirParser parser;
-                    parser.setSource(QString::fromUtf8(unit->resources.at(ii)->data));
-                    parser.parse();
-                    qmldircomponentsnetwork = parser.components();
-                    break;
-                }
-            }
-        }
-
-
-        int vmaj = -1;
-        int vmin = -1;
-        if (!imp.version.isEmpty()) {
-            int dot = imp.version.indexOf(QLatin1Char('.'));
-            if (dot < 0) {
-                vmaj = imp.version.toInt();
-                vmin = 0;
-            } else {
-                vmaj = imp.version.left(dot).toInt();
-                vmin = imp.version.mid(dot+1).toInt();
-            }
-        }
-
-        QString errorString;
-        if (!unit->imports.addImport(importDatabase, 
-                                     imp.uri, imp.qualifier, vmaj, vmin, imp.type, 
-                                     qmldircomponentsnetwork, &errorString)) {
-            QDeclarativeError error;
-            error.setUrl(unit->imports.baseUrl());
-            error.setDescription(errorString);
-            error.setLine(imp.location.start.line);
-            error.setColumn(imp.location.start.column);
-            unit->status = QDeclarativeCompositeTypeData::Error;
-            unit->errorType = QDeclarativeCompositeTypeData::GeneralError;
-            unit->errors << error;
-            doComplete(unit);
-            return 0;
-        }
-    }
-
-
-    QList<QDeclarativeScriptParser::TypeReference*> types = unit->data.referencedTypes();
-
-    for (int ii = 0; ii < types.count(); ++ii) {
-        QDeclarativeScriptParser::TypeReference *parserRef = types.at(ii);
-        QByteArray typeName = parserRef->name.toUtf8();
-
-        QDeclarativeCompositeTypeData::TypeReference ref;
-
-        QUrl url;
-        int majorVersion;
-        int minorVersion;
-        QDeclarativeImportedNamespace *typeNamespace = 0;
-        QString errorString;
-        if (!unit->imports.resolveType(typeName, &ref.type, &url, &majorVersion, &minorVersion, 
-                                       &typeNamespace, &errorString) || typeNamespace) {
-            // Known to not be a type:
-            //  - known to be a namespace (Namespace {})
-            //  - type with unknown namespace (UnknownNamespace.SomeType {})
-            QDeclarativeError error;
-            error.setUrl(unit->imports.baseUrl());
-            QString userTypeName = QString::fromUtf8(typeName);
-            userTypeName.replace(QLatin1Char('/'),QLatin1Char('.'));
-            if (typeNamespace)
-                error.setDescription(tr("Namespace %1 cannot be used as a type").arg(userTypeName));
-            else
-                error.setDescription(tr("%1 %2").arg(userTypeName).arg(errorString));
-
-            if (!parserRef->refObjects.isEmpty()) {
-                QDeclarativeParser::Object *obj = parserRef->refObjects.first();
-                error.setLine(obj->location.start.line);
-                error.setColumn(obj->location.start.column);
-            }
-            unit->status = QDeclarativeCompositeTypeData::Error;
-            unit->errorType = QDeclarativeCompositeTypeData::GeneralError;
-            unit->errors << error;
-            doComplete(unit);
-            return 0;
-        }
-
-        if (ref.type) {
-            foreach (QDeclarativeParser::Object *obj, parserRef->refObjects) {
-               // store namespace for DOM
-               obj->majorVersion = majorVersion;
-               obj->minorVersion = minorVersion;
-            }
-            unit->types << ref;
-            continue;
-        }
-
-        Redirects::Iterator redir = redirects.find(url);
-        if (redir != redirects.end())
-            url = *redir;
-
-        QDeclarativeCompositeTypeData *urlUnit = components.value(url);
-
-        if (!urlUnit) {
-            urlUnit = new QDeclarativeCompositeTypeData;
-            urlUnit->status = QDeclarativeCompositeTypeData::Waiting;
-            urlUnit->imports.setBaseUrl(url);
-            components.insert(url, urlUnit);
-
-            loadSource(urlUnit);
-        }
-
-        ref.unit = urlUnit;
-        switch(urlUnit->status) {
-        case QDeclarativeCompositeTypeData::Invalid:
-        case QDeclarativeCompositeTypeData::Error:
-            unit->status = QDeclarativeCompositeTypeData::Error;
-            {
-                QDeclarativeError error;
-                error.setUrl(unit->imports.baseUrl());
-                error.setDescription(tr("Type %1 unavailable").arg(QString::fromUtf8(typeName)));
-                if (!parserRef->refObjects.isEmpty()) {
-                    QDeclarativeParser::Object *obj = parserRef->refObjects.first();
-                    error.setLine(obj->location.start.line);
-                    error.setColumn(obj->location.start.column);
-                }
-                unit->errors << error;
-            }
-            if (urlUnit->errorType != QDeclarativeCompositeTypeData::AccessError) 
-                unit->errors << urlUnit->errors;
-            doComplete(unit);
-            return 0;
-
-        case QDeclarativeCompositeTypeData::Complete:
-            break;
-
-        case QDeclarativeCompositeTypeData::Waiting:
-        case QDeclarativeCompositeTypeData::WaitingResources:
-            unit->addref();
-            ref.unit->dependants << unit;
-            waiting++;
-            break;
-        }
-
-        unit->types << ref;
-    }
-    return waiting;
-}
-
-// ### Check ref counting in here
-void QDeclarativeCompositeTypeManager::compile(QDeclarativeCompositeTypeData *unit)
-{
-    int waiting = 0;
-
-    QList<QUrl> resourceList = unit->data.referencedResources();
-
-    foreach (QDeclarativeScriptParser::Import imp, unit->data.imports()) {
-        if (imp.type == QDeclarativeScriptParser::Import::File && imp.qualifier.isEmpty()) {
-            QUrl importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir")));
-            if (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(importUrl).isEmpty()) {
-                // Import requires remote qmldir
-                resourceList.prepend(importUrl);
-            }
-        }
-    }
-
-    QUrl importUrl;
-    if (!unit->imports.baseUrl().scheme().isEmpty())
-        importUrl = unit->imports.baseUrl().resolved(QUrl(QLatin1String("qmldir")));
-    if (!importUrl.scheme().isEmpty() && QDeclarativeEnginePrivate::urlToLocalFileOrQrc(importUrl).isEmpty())
-        resourceList.prepend(importUrl);
-
-    for (int ii = 0; ii < resourceList.count(); ++ii) {
-        QUrl url = unit->imports.baseUrl().resolved(resourceList.at(ii));
-
-        QDeclarativeCompositeTypeResource *resource = resources.value(url);
-
-        if (!resource) {
-            resource = new QDeclarativeCompositeTypeResource;
-            resource->status = QDeclarativeCompositeTypeResource::Waiting;
-            resource->url = url.toString();
-            resources.insert(url, resource);
-
-            loadResource(resource);
-        }
-
-        switch(resource->status) {
-        case QDeclarativeCompositeTypeResource::Invalid:
-        case QDeclarativeCompositeTypeResource::Error:
-            unit->status = QDeclarativeCompositeTypeData::Error;
-            {
-                QDeclarativeError error;
-                error.setUrl(unit->imports.baseUrl());
-                error.setDescription(tr("Resource %1 unavailable").arg(resource->url));
-                unit->errors << error;
-            }
-            doComplete(unit);
-            return;
-
-        case QDeclarativeCompositeTypeData::Complete:
-            break;
-
-        case QDeclarativeCompositeTypeData::Waiting:
-            unit->addref();
-            resource->dependants << unit;
-            waiting++;
-            break;
-        }
-
-        resource->addref();
-        unit->resources << resource;
-    }
-
-    if (waiting == 0) {
-        waiting += resolveTypes(unit);
-        if (unit->status != QDeclarativeCompositeTypeData::Error) {
-            if (!waiting) {
-                unit->status = QDeclarativeCompositeTypeData::Complete;
-                doComplete(unit);
-            } else {
-                unit->status = QDeclarativeCompositeTypeData::Waiting;
-            }
-        }
-    } else {
-        unit->status = QDeclarativeCompositeTypeData::WaitingResources;
-    }
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecompositetypemanager_p.h b/src/declarative/qml/qdeclarativecompositetypemanager_p.h
deleted file mode 100644
index 5c82c4c..0000000
--- a/src/declarative/qml/qdeclarativecompositetypemanager_p.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVECOMPOSITETYPEMANAGER_P_H
-#define QDECLARATIVECOMPOSITETYPEMANAGER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "private/qdeclarativescriptparser_p.h"
-#include "private/qdeclarativerefcount_p.h"
-#include "qdeclarativeerror.h"
-#include "qdeclarativeengine.h"
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeCompiledData;
-class QDeclarativeComponentPrivate;
-class QDeclarativeComponent;
-class QDeclarativeDomDocument;
-
-class QDeclarativeCompositeTypeData;
-class QDeclarativeCompositeTypeResource;
-
-class QDeclarativeCompositeTypeManager : public QObject
-{
-    Q_OBJECT
-public:
-    QDeclarativeCompositeTypeManager(QDeclarativeEngine *);
-    ~QDeclarativeCompositeTypeManager();
-
-    // Return a QDeclarativeCompositeTypeData for url.  The QDeclarativeCompositeTypeData may be 
-    // cached.
-    QDeclarativeCompositeTypeData *get(const QUrl &url);
-    // Return a QDeclarativeCompositeTypeData for data, with the provided base url.  The
-   //  QDeclarativeCompositeTypeData will not be cached.
-    QDeclarativeCompositeTypeData *getImmediate(const QByteArray &data, const QUrl &url);
-
-    // Clear cached types.  Only types that aren't in the Waiting state will
-    // be cleared.
-    void clearCache();
-
-private Q_SLOTS:
-    void replyFinished();
-    void resourceReplyFinished();
-    void requestProgress(qint64 received, qint64 total);
-
-private:
-    void loadSource(QDeclarativeCompositeTypeData *);
-    void loadResource(QDeclarativeCompositeTypeResource *);
-    void compile(QDeclarativeCompositeTypeData *);
-    void setData(QDeclarativeCompositeTypeData *, const QByteArray &, const QUrl &);
-
-    void doComplete(QDeclarativeCompositeTypeData *);
-    void doComplete(QDeclarativeCompositeTypeResource *);
-    void checkComplete(QDeclarativeCompositeTypeData *);
-    int resolveTypes(QDeclarativeCompositeTypeData *);
-
-    QDeclarativeEngine *engine;
-    typedef QHash<QUrl, QDeclarativeCompositeTypeData *> Components;
-    Components components;
-    typedef QHash<QUrl, QDeclarativeCompositeTypeResource *> Resources;
-    Resources resources;
-    typedef QHash<QUrl, QUrl> Redirects;
-    Redirects redirects;
-    int redirectCount;
-};
-
-QT_END_NAMESPACE
-
-#endif // QDECLARATIVECOMPOSITETYPEMANAGER_P_H
-
diff --git a/src/declarative/qml/qdeclarativedom.cpp b/src/declarative/qml/qdeclarativedom.cpp
index 5b30bde..1a9b501 100644
--- a/src/declarative/qml/qdeclarativedom.cpp
+++ b/src/declarative/qml/qdeclarativedom.cpp
@@ -42,7 +42,6 @@
 #include "private/qdeclarativedom_p.h"
 #include "private/qdeclarativedom_p_p.h"
 
-#include "private/qdeclarativecompositetypedata_p.h"
 #include "private/qdeclarativecompiler_p.h"
 #include "private/qdeclarativeengine_p.h"
 #include "private/qdeclarativescriptparser_p.h"
@@ -145,37 +144,23 @@ bool QDeclarativeDomDocument::load(QDeclarativeEngine *engine, const QByteArray
     d->errors.clear();
     d->imports.clear();
 
-    QDeclarativeCompiledData *component = new QDeclarativeCompiledData(engine);
-    QDeclarativeCompiler compiler;
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
+    QDeclarativeTypeData *td = ep->typeLoader.get(data, url, QDeclarativeTypeLoader::PreserveParser);
 
-    QDeclarativeCompositeTypeData *td = ((QDeclarativeEnginePrivate *)QDeclarativeEnginePrivate::get(engine))->typeManager.getImmediate(data, url);
-
-    if(td->status == QDeclarativeCompositeTypeData::Error) {
-        d->errors = td->errors;
+    if(td->isError()) {
+        d->errors = td->errors();
         td->release();
-        component->release();
         return false;
-    } else if(td->status == QDeclarativeCompositeTypeData::Waiting ||
-              td->status == QDeclarativeCompositeTypeData::WaitingResources) {
+    } else if(!td->isCompleteOrError()) {
         QDeclarativeError error;
         error.setDescription(QLatin1String("QDeclarativeDomDocument supports local types only"));
         d->errors << error;
         td->release();
-        component->release();
-        return false;
-    }
-
-    compiler.compile(engine, td, component);
-
-    if (compiler.isError()) {
-        d->errors = compiler.errors();
-        td->release();
-        component->release();
         return false;
     }
 
-    for (int i = 0; i < td->data.imports().size(); ++i) {
-        QDeclarativeScriptParser::Import parserImport = td->data.imports().at(i);
+    for (int i = 0; i < td->parser().imports().size(); ++i) {
+        QDeclarativeScriptParser::Import parserImport = td->parser().imports().at(i);
         QDeclarativeDomImport domImport;
         domImport.d->type = static_cast<QDeclarativeDomImportPrivate::Type>(parserImport.type);
         domImport.d->uri = parserImport.uri;
@@ -184,12 +169,12 @@ bool QDeclarativeDomDocument::load(QDeclarativeEngine *engine, const QByteArray
         d->imports += domImport;
     }
 
-    if (td->data.tree()) {
-        d->root = td->data.tree();
+    if (td->parser().tree()) {
+        d->root = td->parser().tree();
         d->root->addref();
     }
 
-    component->release();
+    td->release();
     return true;
 }
 
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index c5a5c18..6a2808c 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -259,7 +259,7 @@ QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e)
   objectClass(0), valueTypeClass(0), globalClass(0), cleanup(0), erroredBindings(0),
   inProgressCreations(0), scriptEngine(this), workerScriptEngine(0), componentAttached(0),
   inBeginCreate(false), networkAccessManager(0), networkAccessManagerFactory(0),
-  typeManager(e), importDatabase(e), uniqueId(1)
+  typeLoader(e), importDatabase(e), uniqueId(1)
 {
     if (!qt_QmlQtModule_registered) {
         qt_QmlQtModule_registered = true;
@@ -565,7 +565,7 @@ QDeclarativeEngine::~QDeclarativeEngine()
 void QDeclarativeEngine::clearComponentCache()
 {
     Q_D(QDeclarativeEngine);
-    d->typeManager.clearCache();
+    d->typeLoader.clearCache();
 }
 
 /*!
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index db2db35..dc7315d 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -56,7 +56,7 @@
 #include "qdeclarativeengine.h"
 
 #include "private/qdeclarativeclassfactory_p.h"
-#include "private/qdeclarativecompositetypemanager_p.h"
+#include "private/qdeclarativetypeloader_p.h"
 #include "private/qdeclarativeimport_p.h"
 #include "private/qpodvector_p.h"
 #include "qdeclarative.h"
@@ -239,7 +239,7 @@ public:
 
     mutable QMutex mutex;
 
-    QDeclarativeCompositeTypeManager typeManager;
+    QDeclarativeTypeLoader typeLoader;
     QDeclarativeImportDatabase importDatabase;
 
     QString offlineStoragePath;
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index 515c4d6..d0dd2e8 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -42,7 +42,6 @@
 #include "qdeclarativeproperty.h"
 #include "private/qdeclarativeproperty_p.h"
 
-#include "private/qdeclarativecompositetypedata_p.h"
 #include "qdeclarative.h"
 #include "private/qdeclarativebinding_p.h"
 #include "qdeclarativecontext.h"
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp
index 6460448..c956051 100644
--- a/src/declarative/qml/qdeclarativescriptparser.cpp
+++ b/src/declarative/qml/qdeclarativescriptparser.cpp
@@ -387,7 +387,6 @@ bool ProcessAST::visit(AST::UiImport *node)
 
         if (uri.endsWith(QLatin1String(".js"))) {
             import.type = QDeclarativeScriptParser::Import::Script;
-            _parser->_refUrls << QUrl(uri);
         } else {
             import.type = QDeclarativeScriptParser::Import::File;
         }
@@ -878,11 +877,6 @@ QList<QDeclarativeScriptParser::TypeReference*> QDeclarativeScriptParser::refere
     return _refTypes;
 }
 
-QList<QUrl> QDeclarativeScriptParser::referencedResources() const
-{
-    return _refUrls;
-}
-
 Object *QDeclarativeScriptParser::tree() const
 {
     return root;
diff --git a/src/declarative/qml/qdeclarativescriptparser_p.h b/src/declarative/qml/qdeclarativescriptparser_p.h
index 6f191af..6319e11 100644
--- a/src/declarative/qml/qdeclarativescriptparser_p.h
+++ b/src/declarative/qml/qdeclarativescriptparser_p.h
@@ -103,7 +103,6 @@ public:
     bool parse(const QByteArray &data, const QUrl &url = QUrl());
 
     QList<TypeReference*> referencedTypes() const;
-    QList<QUrl> referencedResources() const;
 
     QDeclarativeParser::Object *tree() const;
     QList<Import> imports() const;
@@ -138,7 +137,6 @@ public:
     QDeclarativeParser::Object *root;
     QList<Import> _imports;
     QList<TypeReference*> _refTypes;
-    QList<QUrl> _refUrls;
     QString _scriptFile;
     QDeclarativeScriptParserJsASTData *data;
 };
diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp
new file mode 100644
index 0000000..8c291f2
--- /dev/null
+++ b/src/declarative/qml/qdeclarativetypeloader.cpp
@@ -0,0 +1,1070 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativetypeloader_p.h"
+
+#include <private/qdeclarativeengine_p.h>
+#include <private/qdeclarativecompiler_p.h>
+#include <private/qdeclarativecomponent_p.h>
+
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+\class QDeclarativeDataBlob
+\brief The QDeclarativeDataBlob encapsulates a data request that can be issued to a QDeclarativeDataLoader.
+\internal
+
+QDeclarativeDataBlob's are loaded by a QDeclarativeDataLoader.  The user creates the QDeclarativeDataBlob
+and then calls QDeclarativeDataLoader::load() or QDeclarativeDataLoader::loadWithStaticData() to load it.
+The QDeclarativeDataLoader invokes callbacks on the QDeclarativeDataBlob as data becomes available.
+*/
+
+/*!
+\enum QDeclarativeDataBlob::Status
+
+\o Null The blob has not yet been loaded by a QDeclarativeDataLoader
+\o Loading The blob is loading network data.  The QDeclarativeDataBlob::setData() callback has not yet been
+invoked or has not yet returned.
+\o WaitingForDependencies The blob is waiting for dependencies to be done before continueing.  This status
+only occurs after the QDeclarativeDataBlob::setData() callback has been made, and when the blob has outstanding
+dependencies.
+\o Complete The blob's data has been loaded and all dependencies are done.
+\o Error An error has been set on this blob.
+*/
+
+/*!
+\enum QDeclarativeDataBlob::Type
+\o QmlFile This is a QDeclarativeTypeData
+\o JavaScriptFile This is a QDeclarativeScriptData
+\o QmldirFile This is a QDeclarativeQmldirData
+*/
+
+/*!
+Create a new QDeclarativeDataBlob for \a url and of the provided \a type.
+*/
+QDeclarativeDataBlob::QDeclarativeDataBlob(const QUrl &url, Type type)
+: m_type(type), m_status(Null), m_progress(0), m_url(url), m_finalUrl(url), m_manager(0),
+  m_redirectCount(0), m_inCallback(false), m_isDone(false)
+{
+}
+
+/*!  \internal */
+QDeclarativeDataBlob::~QDeclarativeDataBlob()
+{
+    Q_ASSERT(m_waitingOnMe.isEmpty());
+
+    cancelAllWaitingFor();
+}
+
+/*!
+Returns the type provided to the constructor.
+*/
+QDeclarativeDataBlob::Type QDeclarativeDataBlob::type() const
+{
+    return m_type;
+}
+
+/*!
+Returns the blob's status.
+*/
+QDeclarativeDataBlob::Status QDeclarativeDataBlob::status() const
+{
+    return m_status;
+}
+
+/*!
+Returns true if the status is Null.
+*/
+bool QDeclarativeDataBlob::isNull() const
+{
+    return m_status == Null;
+}
+
+/*!
+Returns true if the status is Loading.
+*/
+bool QDeclarativeDataBlob::isLoading() const
+{
+    return m_status == Loading;
+}
+
+/*!
+Returns true if the status is WaitingForDependencies.
+*/
+bool QDeclarativeDataBlob::isWaiting() const
+{
+    return m_status == WaitingForDependencies;
+}
+
+/*!
+Returns true if the status is Complete.
+*/
+bool QDeclarativeDataBlob::isComplete() const
+{
+    return m_status == Complete;
+}
+
+/*!
+Returns true if the status is Error.
+*/
+bool QDeclarativeDataBlob::isError() const
+{
+    return m_status == Error;
+}
+
+/*!
+Returns true if the status is Complete or Error.
+*/
+bool QDeclarativeDataBlob::isCompleteOrError() const
+{
+    return isComplete() || isError();
+}
+
+/*!
+Returns the data download progress from 0 to 1.
+*/
+qreal QDeclarativeDataBlob::progress() const
+{
+    return m_progress;
+}
+
+/*!
+Returns the blob url passed to the constructor.  If a network redirect
+happens while fetching the data, this url remains the same.
+
+\sa finalUrl()
+*/
+QUrl QDeclarativeDataBlob::url() const
+{
+    return m_url;
+}
+
+/*!
+Returns the final url of the data.  Initially this is the same as
+url(), but if a network redirect happens while fetching the data, this url
+is updated to reflect the new location.
+*/
+QUrl QDeclarativeDataBlob::finalUrl() const
+{
+    return m_finalUrl;
+}
+
+/*!
+Return the errors on this blob.
+*/
+QList<QDeclarativeError> QDeclarativeDataBlob::errors() const
+{
+    return m_errors;
+}
+
+/*!
+Mark this blob as having \a errors.
+
+All outstanding dependencies will be cancelled.  Requests to add new dependencies 
+will be ignored.  Entry into the Error state is irreversable, although you can change the 
+specific errors by additional calls to setError.
+*/
+void QDeclarativeDataBlob::setError(const QDeclarativeError &errors)
+{
+    QList<QDeclarativeError> l;
+    l << errors;
+    setError(l);
+}
+
+/*!
+\override
+*/
+void QDeclarativeDataBlob::setError(const QList<QDeclarativeError> &errors)
+{
+    m_status = Error;
+    m_errors = errors;
+
+    cancelAllWaitingFor();
+
+    if (!m_inCallback)
+        tryDone();
+}
+
+/*! 
+Wait for \a blob to become complete or to error.  If \a blob is already 
+complete or in error, or this blob is already complete, this has no effect.
+*/
+void QDeclarativeDataBlob::addDependency(QDeclarativeDataBlob *blob)
+{
+    Q_ASSERT(status() != Null);
+
+    if (!blob ||
+        blob->status() == Error || blob->status() == Complete ||
+        status() == Error || status() == Complete ||
+        m_waitingFor.contains(blob))
+        return;
+
+    blob->addref();
+    m_status = WaitingForDependencies;
+    m_waitingFor.append(blob);
+    blob->m_waitingOnMe.append(this);
+}
+
+/*!
+\fn void QDeclarativeDataBlob::dataReceived(const QByteArray &data)
+
+Invoked when data for the blob is received.  Implementors should use this callback
+to determine a blob's dependencies.  Within this callback you may call setError()
+or addDependency().
+*/
+
+/*!
+Invoked once data has either been received or a network error occurred, and all 
+dependencies are complete.
+
+You can set an error in this method, but you cannot add new dependencies.  Implementors
+should use this callback to finalize processing of data.
+
+The default implementation does nothing.
+*/
+void QDeclarativeDataBlob::done()
+{
+}
+
+/*!
+Invoked if there is a network error while fetching this blob.
+
+The default implementation sets an appropriate QDeclarativeError.
+*/
+void QDeclarativeDataBlob::networkError(QNetworkReply::NetworkError networkError)
+{
+    Q_UNUSED(networkError);
+
+    QDeclarativeError error;
+    error.setUrl(m_finalUrl);
+
+    const char *errorString = 0;
+    switch (networkError) {
+        default:
+            errorString = "Network error";
+            break;
+        case QNetworkReply::ConnectionRefusedError:
+            errorString = "Connection refused";
+            break;
+        case QNetworkReply::RemoteHostClosedError:
+            errorString = "Remote host closed the connection";
+            break;
+        case QNetworkReply::HostNotFoundError:
+            errorString = "Host not found";
+            break;
+        case QNetworkReply::TimeoutError:
+            errorString = "Timeout";
+            break;
+        case QNetworkReply::ProxyConnectionRefusedError:
+        case QNetworkReply::ProxyConnectionClosedError:
+        case QNetworkReply::ProxyNotFoundError:
+        case QNetworkReply::ProxyTimeoutError:
+        case QNetworkReply::ProxyAuthenticationRequiredError:
+        case QNetworkReply::UnknownProxyError:
+            errorString = "Proxy error";
+            break;
+        case QNetworkReply::ContentAccessDenied:
+            errorString = "Access denied";
+            break;
+        case QNetworkReply::ContentNotFoundError:
+            errorString = "File not found";
+            break;
+        case QNetworkReply::AuthenticationRequiredError:
+            errorString = "Authentication required";
+            break;
+    };
+
+    error.setDescription(QLatin1String(errorString));
+
+    setError(error);
+}
+
+/*! 
+Called if \a blob, which was previously waited for, has an error.
+
+The default implementation does nothing.
+*/
+void QDeclarativeDataBlob::dependencyError(QDeclarativeDataBlob *blob)
+{
+    Q_UNUSED(blob);
+}
+
+/*!
+Called if \a blob, which was previously waited for, has completed.
+
+The default implementation does nothing.
+*/
+void QDeclarativeDataBlob::dependencyComplete(QDeclarativeDataBlob *blob)
+{
+    Q_UNUSED(blob);
+}
+
+/*! 
+Called when all blobs waited for have completed.  This occurs regardless of 
+whether they are in error, or complete state.  
+
+The default implementation does nothing.
+*/
+void QDeclarativeDataBlob::allDependenciesDone()
+{
+}
+
+/*!
+Called when the download progress of this blob changes.  \a progress goes
+from 0 to 1.
+*/
+void QDeclarativeDataBlob::downloadProgressChanged(qreal progress)
+{
+    Q_UNUSED(progress);
+}
+
+void QDeclarativeDataBlob::tryDone()
+{
+    if (status() != Loading && m_waitingFor.isEmpty() && !m_isDone) {
+        if (status() != Error)
+            m_status = Complete;
+
+        m_isDone = true;
+        done();
+        notifyAllWaitingOnMe();
+    }
+}
+
+void QDeclarativeDataBlob::cancelAllWaitingFor()
+{
+    while (m_waitingFor.count()) {
+        QDeclarativeDataBlob *blob = m_waitingFor.takeLast();
+
+        Q_ASSERT(blob->m_waitingOnMe.contains(this));
+
+        blob->m_waitingOnMe.removeOne(this);
+
+        blob->release();
+    }
+}
+
+void QDeclarativeDataBlob::notifyAllWaitingOnMe()
+{
+    while (m_waitingOnMe.count()) {
+        QDeclarativeDataBlob *blob = m_waitingOnMe.takeLast();
+
+        Q_ASSERT(blob->m_waitingFor.contains(this));
+
+        blob->notifyComplete(this);
+    }
+}
+
+void QDeclarativeDataBlob::notifyComplete(QDeclarativeDataBlob *blob)
+{
+    Q_ASSERT(m_waitingFor.contains(blob));
+    Q_ASSERT(blob->status() == Error || blob->status() == Complete);
+
+    m_inCallback = true;
+
+    if (blob->status() == Error) {
+        dependencyError(blob);
+    } else if (blob->status() == Complete) {
+        dependencyComplete(blob);
+    }
+
+    m_waitingFor.removeOne(blob);
+    blob->release();
+
+    if (!isError() && m_waitingFor.isEmpty()) 
+        allDependenciesDone();
+
+    m_inCallback = false;
+
+    tryDone();
+}
+
+/*!
+\class QDeclarativeDataLoader
+\brief The QDeclarativeDataLoader class abstracts loading files and their dependecies over the network.
+\internal
+
+The QDeclarativeDataLoader class is provided for the exclusive use of the QDeclarativeTypeLoader class.
+
+Clients create QDeclarativeDataBlob instances and submit them to the QDeclarativeDataLoader class
+through the QDeclarativeDataLoader::load() or QDeclarativeDataLoader::loadWithStaticData() methods.
+The loader then fetches the data over the network or from the local file system in an efficient way.
+QDeclarativeDataBlob is an abstract class, so should always be specialized.
+
+Once data is received, the QDeclarativeDataBlob::dataReceived() method is invoked on the blob.  The
+derived class should use this callback to process the received data.  Processing of the data can 
+result in an error being set (QDeclarativeDataBlob::setError()), or one or more dependencies being
+created (QDeclarativeDataBlob::addDependency()).  Dependencies are other QDeclarativeDataBlob's that
+are required before processing can fully complete.
+
+To complete processing, the QDeclarativeDataBlob::done() callback is invoked.  done() is called when
+one of these three preconditions are met.
+
+1.  The QDeclarativeDataBlob has no dependencies.
+2.  The QDeclarativeDataBlob has an error set.
+3.  All the QDeclarativeDataBlob's dependencies are themselves "done()".
+
+Thus QDeclarativeDataBlob::done() will always eventually be called, even if the blob has an error set.
+*/
+
+/*!
+Create a new QDeclarativeDataLoader for \a engine.
+*/
+QDeclarativeDataLoader::QDeclarativeDataLoader(QDeclarativeEngine *engine)
+: m_engine(engine)
+{
+}
+
+/*! \internal */
+QDeclarativeDataLoader::~QDeclarativeDataLoader()
+{
+    for (NetworkReplies::Iterator iter = m_networkReplies.begin(); iter != m_networkReplies.end(); ++iter) 
+        (*iter)->release();
+}
+
+/*!
+Load the provided \a blob from the network or filesystem.
+*/
+void QDeclarativeDataLoader::load(QDeclarativeDataBlob *blob)
+{
+    Q_ASSERT(blob->status() == QDeclarativeDataBlob::Null);
+    Q_ASSERT(blob->m_manager == 0);
+
+    blob->m_status = QDeclarativeDataBlob::Loading;
+
+    if (blob->m_url.isEmpty()) {
+        QDeclarativeError error;
+        error.setDescription(QLatin1String("Invalid null URL"));
+        blob->setError(error);
+        return;
+    }
+
+    QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(blob->m_url);
+
+    if (!lf.isEmpty()) {
+        QFile file(lf);
+        if (file.open(QFile::ReadOnly)) {
+            QByteArray data = file.readAll();
+
+            blob->m_progress = 1.;
+            blob->downloadProgressChanged(1.);
+
+            setData(blob, data);
+        } else {
+            blob->networkError(QNetworkReply::ContentNotFoundError);
+        }
+
+    } else {
+
+        blob->m_manager = this;
+        QNetworkReply *reply = m_engine->networkAccessManager()->get(QNetworkRequest(blob->m_url));
+        QObject::connect(reply, SIGNAL(downloadProgress(qint64,qint64)), 
+                         this, SLOT(networkReplyProgress(qint64,qint64)));
+        QObject::connect(reply, SIGNAL(finished()), 
+                         this, SLOT(networkReplyFinished()));
+        m_networkReplies.insert(reply, blob);
+
+        blob->addref();
+    }
+}
+
+#define DATALOADER_MAXIMUM_REDIRECT_RECURSION 16
+
+void QDeclarativeDataLoader::networkReplyFinished()
+{
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    reply->deleteLater();
+
+    QDeclarativeDataBlob *blob = m_networkReplies.take(reply);
+
+    Q_ASSERT(blob);
+
+    blob->m_redirectCount++;
+
+    if (blob->m_redirectCount < DATALOADER_MAXIMUM_REDIRECT_RECURSION) {
+        QVariant redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
+        if (redirect.isValid()) {
+            QUrl url = reply->url().resolved(redirect.toUrl());
+            blob->m_finalUrl = url;
+
+            QNetworkReply *reply = m_engine->networkAccessManager()->get(QNetworkRequest(url));
+            QObject::connect(reply, SIGNAL(finished()), this, SLOT(networkReplyFinished()));
+            m_networkReplies.insert(reply, blob);
+            return;
+        }
+    }
+
+    if (reply->error()) {
+        blob->networkError(reply->error());
+    } else {
+        QByteArray data = reply->readAll();
+        setData(blob, data);
+    }
+
+    blob->release();
+}
+
+void QDeclarativeDataLoader::networkReplyProgress(qint64 bytesReceived, qint64 bytesTotal)
+{
+    QNetworkReply *reply = static_cast<QNetworkReply *>(sender());
+    QDeclarativeDataBlob *blob = m_networkReplies.value(reply);
+
+    Q_ASSERT(blob);
+
+    if (bytesTotal != 0) {
+        blob->m_progress = bytesReceived / bytesTotal;
+        blob->downloadProgressChanged(blob->m_progress);
+    }
+}
+
+/*!
+Load the provided \a blob with \a data.  The blob's URL is not used by the data loader in this case.
+*/
+void QDeclarativeDataLoader::loadWithStaticData(QDeclarativeDataBlob *blob, const QByteArray &data)
+{
+    Q_ASSERT(blob->status() == QDeclarativeDataBlob::Null);
+    Q_ASSERT(blob->m_manager == 0);
+    
+    blob->m_status = QDeclarativeDataBlob::Loading;
+
+    setData(blob, data);
+}
+
+/*!
+Return the QDeclarativeEngine associated with this loader
+*/
+QDeclarativeEngine *QDeclarativeDataLoader::engine() const
+{
+    return m_engine;
+}
+
+void QDeclarativeDataLoader::setData(QDeclarativeDataBlob *blob, const QByteArray &data)
+{
+    blob->m_inCallback = true;
+
+    blob->dataReceived(data);
+
+    if (!blob->isError() && !blob->isWaiting())
+        blob->allDependenciesDone();
+
+    if (blob->status() != QDeclarativeDataBlob::Error) 
+        blob->m_status = QDeclarativeDataBlob::WaitingForDependencies;
+
+    blob->m_inCallback = false;
+
+    blob->tryDone();
+}
+
+/*!
+\class QDeclarativeTypeLoader
+*/
+QDeclarativeTypeLoader::QDeclarativeTypeLoader(QDeclarativeEngine *engine)
+: QDeclarativeDataLoader(engine)
+{
+}
+
+QDeclarativeTypeLoader::~QDeclarativeTypeLoader()
+{
+    clearCache();
+}
+
+/*!
+Return a QDeclarativeTypeData for \a url.  The QDeclarativeTypeData may be cached.
+*/
+QDeclarativeTypeData *QDeclarativeTypeLoader::get(const QUrl &url)
+{
+    Q_ASSERT(!url.isRelative() && 
+            (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url).isEmpty() || 
+             !QDir::isRelativePath(QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url))));
+
+    QDeclarativeTypeData *typeData = m_typeCache.value(url);
+
+    if (!typeData) {
+        typeData = new QDeclarativeTypeData(url, None, this);
+        m_typeCache.insert(url, typeData);
+        QDeclarativeDataLoader::load(typeData);
+    }
+
+    typeData->addref();
+    return typeData;
+}
+
+/*!
+Return a QDeclarativeTypeData for \a data with the provided base \a url.  The 
+QDeclarativeTypeData will not be cached.
+*/
+QDeclarativeTypeData *QDeclarativeTypeLoader::get(const QByteArray &data, const QUrl &url, Options options)
+{
+    QDeclarativeTypeData *typeData = new QDeclarativeTypeData(url, options, this);
+    QDeclarativeDataLoader::loadWithStaticData(typeData, data);
+    return typeData;
+}
+
+/*!
+Return a QDeclarativeScriptData for \a url.  The QDeclarativeScriptData may be cached.
+*/
+QDeclarativeScriptData *QDeclarativeTypeLoader::getScript(const QUrl &url)
+{
+    Q_ASSERT(!url.isRelative() && 
+            (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url).isEmpty() || 
+             !QDir::isRelativePath(QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url))));
+
+    QDeclarativeScriptData *scriptData = m_scriptCache.value(url);
+
+    if (!scriptData) {
+        scriptData = new QDeclarativeScriptData(url);
+        m_scriptCache.insert(url, scriptData);
+        QDeclarativeDataLoader::load(scriptData);
+    }
+
+    scriptData->addref();
+    return scriptData;
+}
+
+/*!
+Return a QDeclarativeQmldirData for \a url.  The QDeclarativeQmldirData may be cached.
+*/
+QDeclarativeQmldirData *QDeclarativeTypeLoader::getQmldir(const QUrl &url)
+{
+    Q_ASSERT(!url.isRelative() && 
+            (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url).isEmpty() || 
+             !QDir::isRelativePath(QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url))));
+
+    QDeclarativeQmldirData *qmldirData = m_qmldirCache.value(url);
+
+    if (!qmldirData) {
+        qmldirData = new QDeclarativeQmldirData(url);
+        m_qmldirCache.insert(url, qmldirData);
+        QDeclarativeDataLoader::load(qmldirData);
+    }
+
+    qmldirData->addref();
+    return qmldirData;
+}
+
+void QDeclarativeTypeLoader::clearCache()
+{
+    for (TypeCache::Iterator iter = m_typeCache.begin(); iter != m_typeCache.end(); ++iter) 
+        (*iter)->release();
+    for (ScriptCache::Iterator iter = m_scriptCache.begin(); iter != m_scriptCache.end(); ++iter) 
+        (*iter)->release();
+    for (QmldirCache::Iterator iter = m_qmldirCache.begin(); iter != m_qmldirCache.end(); ++iter) 
+        (*iter)->release();
+
+    m_typeCache.clear();
+    m_scriptCache.clear();
+    m_qmldirCache.clear();
+}
+
+
+QDeclarativeTypeData::QDeclarativeTypeData(const QUrl &url, QDeclarativeTypeLoader::Options options, 
+                                           QDeclarativeTypeLoader *manager)
+: QDeclarativeDataBlob(url, QmlFile), m_options(options), m_typesResolved(false), 
+  m_compiledData(0), m_component(0), m_typeLoader(manager)
+{
+}
+
+QDeclarativeTypeData::~QDeclarativeTypeData()
+{
+    for (int ii = 0; ii < m_scripts.count(); ++ii) 
+        m_scripts.at(ii).script->release();
+    for (int ii = 0; ii < m_qmldirs.count(); ++ii) 
+        m_qmldirs.at(ii)->release();
+    for (int ii = 0; ii < m_types.count(); ++ii) 
+        if (m_types.at(ii).typeData) m_types.at(ii).typeData->release();
+    if (m_compiledData)
+        m_compiledData->release();
+}
+
+QDeclarativeTypeLoader *QDeclarativeTypeData::typeLoader() const
+{
+    return m_typeLoader;
+}
+
+const QDeclarativeImports &QDeclarativeTypeData::imports() const
+{
+    return m_imports;
+}
+
+const QDeclarativeScriptParser &QDeclarativeTypeData::parser() const
+{
+    return scriptParser;
+}
+
+const QList<QDeclarativeTypeData::TypeReference> &QDeclarativeTypeData::resolvedTypes() const
+{
+    return m_types;
+}
+
+const QList<QDeclarativeTypeData::ScriptReference> &QDeclarativeTypeData::resolvedScripts() const
+{
+    return m_scripts;
+}
+
+QDeclarativeCompiledData *QDeclarativeTypeData::compiledData() const
+{
+    if (m_compiledData) 
+        m_compiledData->addref();
+
+    return m_compiledData;
+}
+
+QDeclarativeComponent *QDeclarativeTypeData::component() const
+{
+    if (!m_component) {
+
+        if (m_compiledData) {
+            m_component = new QDeclarativeComponent(typeLoader()->engine(), m_compiledData, -1, -1, 0);
+        } else {
+            m_component = new QDeclarativeComponent(typeLoader()->engine());
+            QDeclarativeComponentPrivate::get(m_component)->url = finalUrl();
+            QDeclarativeComponentPrivate::get(m_component)->state.errors = errors();
+        }
+
+    }
+
+    return m_component;
+}
+
+void QDeclarativeTypeData::registerCallback(TypeDataCallback *callback)
+{
+    Q_ASSERT(!m_callbacks.contains(callback));
+    m_callbacks.append(callback);
+}
+
+void QDeclarativeTypeData::unregisterCallback(TypeDataCallback *callback)
+{
+    Q_ASSERT(m_callbacks.contains(callback));
+    m_callbacks.removeOne(callback);
+    Q_ASSERT(!m_callbacks.contains(callback));
+}
+
+void QDeclarativeTypeData::done()
+{
+    addref();
+
+    // Check all script dependencies for errors
+    for (int ii = 0; !isError() && ii < m_scripts.count(); ++ii) {
+        const ScriptReference &script = m_scripts.at(ii);
+        Q_ASSERT(script.script->isCompleteOrError());
+        if (script.script->isError()) {
+            QList<QDeclarativeError> errors = script.script->errors();
+            QDeclarativeError error;
+            error.setUrl(finalUrl());
+            error.setLine(script.location.line);
+            error.setColumn(script.location.column);
+            error.setDescription(typeLoader()->tr("Script %1 unavailable").arg(script.script->url().toString()));
+            errors.prepend(error);
+            setError(errors);
+        }
+    }
+
+    // Check all type dependencies for errors
+    for (int ii = 0; !isError() && ii < m_types.count(); ++ii) {
+        const TypeReference &type = m_types.at(ii);
+        Q_ASSERT(!type.typeData || type.typeData->isCompleteOrError());
+        if (type.typeData && type.typeData->isError()) {
+            QString typeName = scriptParser.referencedTypes().at(ii)->name;
+
+            QList<QDeclarativeError> errors = type.typeData->errors();
+            QDeclarativeError error;
+            error.setUrl(finalUrl());
+            error.setLine(type.location.line);
+            error.setColumn(type.location.column);
+            error.setDescription(typeLoader()->tr("Type %1 unavailable").arg(typeName));
+            errors.prepend(error);
+            setError(errors);
+        }
+    }
+
+    // Compile component
+    if (!isError()) 
+        compile();
+
+    if (!(m_options & QDeclarativeTypeLoader::PreserveParser))
+        scriptParser.clear();
+
+    // Notify callbacks
+    while (!m_callbacks.isEmpty()) {
+        TypeDataCallback *callback = m_callbacks.takeFirst();
+        callback->typeDataReady(this);
+    }
+
+    release();
+}
+
+void QDeclarativeTypeData::dataReceived(const QByteArray &data)
+{
+    if (!scriptParser.parse(data, finalUrl())) {
+        setError(scriptParser.errors());
+        return;
+    }
+
+    m_imports.setBaseUrl(finalUrl());
+
+    foreach (const QDeclarativeScriptParser::Import &import, scriptParser.imports()) {
+        if (import.type == QDeclarativeScriptParser::Import::File && import.qualifier.isEmpty()) {
+            QUrl importUrl = finalUrl().resolved(QUrl(import.uri + QLatin1String("/qmldir")));
+            if (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(importUrl).isEmpty()) {
+                QDeclarativeQmldirData *data = typeLoader()->getQmldir(importUrl);
+                addDependency(data);
+                m_qmldirs << data;
+            }
+        } else if (import.type == QDeclarativeScriptParser::Import::Script) {
+            QUrl scriptUrl = finalUrl().resolved(QUrl(import.uri));
+            QDeclarativeScriptData *data = typeLoader()->getScript(scriptUrl);
+            addDependency(data);
+
+            ScriptReference ref;
+            ref.location = import.location.start;
+            ref.qualifier = import.qualifier;
+            ref.script = data;
+            m_scripts << ref;
+
+        }
+    }
+
+    if (!finalUrl().scheme().isEmpty()) {
+        QUrl importUrl = finalUrl().resolved(QUrl(QLatin1String("qmldir")));
+        if (QDeclarativeEnginePrivate::urlToLocalFileOrQrc(importUrl).isEmpty()) {
+            QDeclarativeQmldirData *data = typeLoader()->getQmldir(importUrl);
+            addDependency(data);
+            m_qmldirs << data;
+        }
+    }
+}
+
+void QDeclarativeTypeData::allDependenciesDone()
+{
+    if (!m_typesResolved) {
+        resolveTypes();
+        m_typesResolved = true;
+    }
+}
+
+void QDeclarativeTypeData::downloadProgressChanged(qreal p)
+{
+    for (int ii = 0; ii < m_callbacks.count(); ++ii) {
+        TypeDataCallback *callback = m_callbacks.at(ii);
+        callback->typeDataProgress(this, p);
+    }
+}
+
+void QDeclarativeTypeData::compile()
+{
+    Q_ASSERT(m_compiledData == 0);
+
+    m_compiledData = new QDeclarativeCompiledData(typeLoader()->engine());
+    m_compiledData->url = m_imports.baseUrl();
+    m_compiledData->name = m_compiledData->url.toString();
+
+    QDeclarativeCompiler compiler;
+    if (!compiler.compile(typeLoader()->engine(), this, m_compiledData)) {
+        setError(compiler.errors());
+        m_compiledData->release();
+        m_compiledData = 0;
+    }
+}
+
+void QDeclarativeTypeData::resolveTypes()
+{
+    QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(m_typeLoader->engine());
+    QDeclarativeImportDatabase *importDatabase = &ep->importDatabase;
+
+    // For local urls, add an implicit import "." as first (most overridden) lookup. 
+    // This will also trigger the loading of the qmldir and the import of any native 
+    // types from available plugins.
+    if (QDeclarativeQmldirData *qmldir = qmldirForUrl(finalUrl().resolved(QUrl(QLatin1String("./qmldir"))))) {
+        m_imports.addImport(importDatabase, QLatin1String("."),
+                            QString(), -1, -1, QDeclarativeScriptParser::Import::File, 
+                            qmldir->dirComponents(), 0);
+    } else {
+        m_imports.addImport(importDatabase, QLatin1String("."), 
+                            QString(), -1, -1, QDeclarativeScriptParser::Import::File, 
+                            QDeclarativeDirComponents(), 0);
+    }
+
+    foreach (const QDeclarativeScriptParser::Import &import, scriptParser.imports()) {
+        QDeclarativeDirComponents qmldircomponentsnetwork;
+        if (import.type == QDeclarativeScriptParser::Import::Script)
+            continue;
+
+        if (import.type == QDeclarativeScriptParser::Import::File && import.qualifier.isEmpty()) {
+            QUrl qmldirUrl = finalUrl().resolved(QUrl(import.uri + QLatin1String("/qmldir")));
+            if (QDeclarativeQmldirData *qmldir = qmldirForUrl(qmldirUrl)) 
+                qmldircomponentsnetwork = qmldir->dirComponents();
+        }
+
+        int vmaj = -1;
+        int vmin = -1;
+
+        if (!import.version.isEmpty()) {
+            int dot = import.version.indexOf(QLatin1Char('.'));
+            if (dot < 0) {
+                vmaj = import.version.toInt();
+                vmin = 0;
+            } else {
+                vmaj = import.version.left(dot).toInt();
+                vmin = import.version.mid(dot+1).toInt();
+            }
+        }
+
+        QString errorString;
+        if (!m_imports.addImport(importDatabase, import.uri, import.qualifier,
+                                 vmaj, vmin, import.type, qmldircomponentsnetwork, &errorString)) {
+            QDeclarativeError error;
+            error.setUrl(m_imports.baseUrl());
+            error.setDescription(errorString);
+            error.setLine(import.location.start.line);
+            error.setColumn(import.location.start.column);
+
+            setError(error);
+            return;
+        }
+    }
+
+    foreach (QDeclarativeScriptParser::TypeReference *parserRef, scriptParser.referencedTypes()) {
+        QByteArray typeName = parserRef->name.toUtf8();
+
+        TypeReference ref;
+
+        QUrl url;
+        int majorVersion;
+        int minorVersion;
+        QDeclarativeImportedNamespace *typeNamespace = 0;
+        QString errorString;
+
+        if (!m_imports.resolveType(typeName, &ref.type, &url, &majorVersion, &minorVersion,
+                                   &typeNamespace, &errorString) || typeNamespace) {
+            // Known to not be a type:
+            //  - known to be a namespace (Namespace {})
+            //  - type with unknown namespace (UnknownNamespace.SomeType {})
+            QDeclarativeError error;
+            error.setUrl(m_imports.baseUrl());
+            QString userTypeName = parserRef->name;
+            userTypeName.replace(QLatin1Char('/'),QLatin1Char('.'));
+            if (typeNamespace)
+                error.setDescription(typeLoader()->tr("Namespace %1 cannot be used as a type").arg(userTypeName));
+            else
+                error.setDescription(typeLoader()->tr("%1 %2").arg(userTypeName).arg(errorString));
+
+            if (!parserRef->refObjects.isEmpty()) {
+                QDeclarativeParser::Object *obj = parserRef->refObjects.first();
+                error.setLine(obj->location.start.line);
+                error.setColumn(obj->location.start.column);
+            }
+            
+            setError(error);
+            return;
+        }
+
+        if (ref.type) {
+            foreach (QDeclarativeParser::Object *obj, parserRef->refObjects) {
+               // store namespace for DOM
+               obj->majorVersion = majorVersion;
+               obj->minorVersion = minorVersion;
+            }
+        } else {
+            ref.typeData = typeLoader()->get(url);
+            addDependency(ref.typeData);
+        }
+
+        if (parserRef->refObjects.count())
+            ref.location = parserRef->refObjects.first()->location.start;
+
+        m_types << ref;
+    }
+}
+
+QDeclarativeQmldirData *QDeclarativeTypeData::qmldirForUrl(const QUrl &url)
+{
+    for (int ii = 0; ii < m_qmldirs.count(); ++ii) {
+        if (m_qmldirs.at(ii)->url() == url)
+            return m_qmldirs.at(ii);
+    }
+    return 0;
+}
+
+QDeclarativeScriptData::QDeclarativeScriptData(const QUrl &url)
+: QDeclarativeDataBlob(url, JavaScriptFile), m_pragmas(QDeclarativeParser::Object::ScriptBlock::None)
+{
+}
+
+QDeclarativeParser::Object::ScriptBlock::Pragmas QDeclarativeScriptData::pragmas() const
+{
+    return m_pragmas;
+}
+
+QString QDeclarativeScriptData::scriptSource() const
+{
+    return m_source;
+}
+
+void QDeclarativeScriptData::dataReceived(const QByteArray &data)
+{
+    m_source = QString::fromUtf8(data);
+    m_pragmas = QDeclarativeScriptParser::extractPragmas(m_source);
+}
+
+QDeclarativeQmldirData::QDeclarativeQmldirData(const QUrl &url)
+: QDeclarativeDataBlob(url, QmldirFile)
+{
+}
+
+const QDeclarativeDirComponents &QDeclarativeQmldirData::dirComponents() const
+{
+    return m_components;
+}
+
+void QDeclarativeQmldirData::dataReceived(const QByteArray &data)
+{
+    QDeclarativeDirParser parser;
+    parser.setSource(QString::fromUtf8(data));
+    parser.parse();
+    m_components = parser.components();
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/declarative/qml/qdeclarativetypeloader_p.h b/src/declarative/qml/qdeclarativetypeloader_p.h
new file mode 100644
index 0000000..7381f28
--- /dev/null
+++ b/src/declarative/qml/qdeclarativetypeloader_p.h
@@ -0,0 +1,321 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QDECLARATIVETYPELOADER_P_H
+#define QDECLARATIVETYPELOADER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qobject.h>
+#include <QtNetwork/qnetworkreply.h>
+#include <QtDeclarative/qdeclarativeerror.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <private/qdeclarativescriptparser_p.h>
+#include <private/qdeclarativedirparser_p.h>
+#include <private/qdeclarativeimport_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeScriptData;
+class QDeclarativeQmldirData;
+class QDeclarativeTypeLoader;
+class QDeclarativeCompiledData;
+class QDeclarativeComponentPrivate;
+class QDeclarativeTypeData;
+class QDeclarativeDataLoader;
+
+class Q_AUTOTEST_EXPORT QDeclarativeDataBlob : public QDeclarativeRefCount
+{
+public:
+    enum Status {
+        Null,                    // Prior to QDeclarativeDataLoader::load()
+        Loading,                 // Prior to data being received and dataReceived() being called
+        WaitingForDependencies,  // While there are outstanding addDependency()s
+        Complete,                // Finished
+        Error,                   // Error
+    };
+
+    enum Type {
+        QmlFile,
+        JavaScriptFile,
+        QmldirFile
+    };
+
+    QDeclarativeDataBlob(const QUrl &, Type);
+    virtual ~QDeclarativeDataBlob();
+
+    Type type() const;
+
+    Status status() const;
+    bool isNull() const;
+    bool isLoading() const;
+    bool isWaiting() const;
+    bool isComplete() const;
+    bool isError() const;
+    bool isCompleteOrError() const;
+
+    qreal progress() const;
+
+    QUrl url() const;
+    QUrl finalUrl() const;
+
+    QList<QDeclarativeError> errors() const;
+
+    void setError(const QDeclarativeError &);
+    void setError(const QList<QDeclarativeError> &errors);
+
+    void addDependency(QDeclarativeDataBlob *);
+
+protected:
+    virtual void dataReceived(const QByteArray &) = 0;
+
+    virtual void done();
+    virtual void networkError(QNetworkReply::NetworkError);
+
+    virtual void dependencyError(QDeclarativeDataBlob *);
+    virtual void dependencyComplete(QDeclarativeDataBlob *);
+    virtual void allDependenciesDone();
+    
+    virtual void downloadProgressChanged(qreal);
+
+private:
+    friend class QDeclarativeDataLoader;
+    void tryDone();
+    void cancelAllWaitingFor();
+    void notifyAllWaitingOnMe();
+    void notifyComplete(QDeclarativeDataBlob *);
+
+    Type m_type;
+    Status m_status;
+    qreal m_progress;
+
+    QUrl m_url;
+    QUrl m_finalUrl;
+
+    // List of QDeclarativeDataBlob's that are waiting for me to complete.
+    QList<QDeclarativeDataBlob *> m_waitingOnMe;     
+
+    // List of QDeclarativeDataBlob's that I am waiting for to complete.
+    QList<QDeclarativeDataBlob *> m_waitingFor;
+
+    // Manager that is currently fetching data for me
+    QDeclarativeDataLoader *m_manager;
+    int m_redirectCount:30;
+    bool m_inCallback:1;
+    bool m_isDone:1;
+
+    QList<QDeclarativeError> m_errors;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeDataLoader : public QObject
+{
+    Q_OBJECT
+public:
+    QDeclarativeDataLoader(QDeclarativeEngine *);
+    ~QDeclarativeDataLoader();
+
+    void load(QDeclarativeDataBlob *);
+    void loadWithStaticData(QDeclarativeDataBlob *, const QByteArray &);
+
+    QDeclarativeEngine *engine() const;
+
+private slots:
+    void networkReplyFinished();
+    void networkReplyProgress(qint64,qint64);
+
+private:
+    void setData(QDeclarativeDataBlob *, const QByteArray &);
+
+    QDeclarativeEngine *m_engine;
+    typedef QHash<QNetworkReply *, QDeclarativeDataBlob *> NetworkReplies;
+    NetworkReplies m_networkReplies;
+};
+
+
+class Q_AUTOTEST_EXPORT QDeclarativeTypeLoader : public QDeclarativeDataLoader
+{
+    Q_OBJECT
+public:
+    QDeclarativeTypeLoader(QDeclarativeEngine *);
+    ~QDeclarativeTypeLoader();
+
+    enum Option {
+        None,
+        PreserveParser
+    };
+    Q_DECLARE_FLAGS(Options, Option)
+
+    QDeclarativeTypeData *get(const QUrl &url);
+    QDeclarativeTypeData *get(const QByteArray &, const QUrl &url, Options = None);
+    void clearCache();
+
+    QDeclarativeScriptData *getScript(const QUrl &);
+    QDeclarativeQmldirData *getQmldir(const QUrl &);
+private:
+    typedef QHash<QUrl, QDeclarativeTypeData *> TypeCache;
+    typedef QHash<QUrl, QDeclarativeScriptData *> ScriptCache;
+    typedef QHash<QUrl, QDeclarativeQmldirData *> QmldirCache;
+
+    TypeCache m_typeCache;
+    ScriptCache m_scriptCache;
+    QmldirCache m_qmldirCache;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeTypeLoader::Options)
+
+class Q_AUTOTEST_EXPORT QDeclarativeTypeData : public QDeclarativeDataBlob
+{
+public:
+    struct TypeReference
+    {
+        TypeReference() : type(0), typeData(0) {}
+
+        QDeclarativeParser::Location location;
+        QDeclarativeType *type;
+        QDeclarativeTypeData *typeData;
+    };
+
+    struct ScriptReference
+    {
+        ScriptReference() : script(0) {}
+
+        QDeclarativeParser::Location location;
+        QString qualifier;
+        QDeclarativeScriptData *script;
+    };
+
+    QDeclarativeTypeData(const QUrl &, QDeclarativeTypeLoader::Options, QDeclarativeTypeLoader *);
+    ~QDeclarativeTypeData();
+
+    QDeclarativeTypeLoader *typeLoader() const;
+
+    const QDeclarativeImports &imports() const;
+    const QDeclarativeScriptParser &parser() const;
+
+    const QList<TypeReference> &resolvedTypes() const;
+    const QList<ScriptReference> &resolvedScripts() const;
+
+    QDeclarativeCompiledData *compiledData() const;
+    QDeclarativeComponent *component() const;
+
+    // Used by QDeclarativeComponent to get notifications
+    struct TypeDataCallback {
+        ~TypeDataCallback() {}
+        virtual void typeDataProgress(QDeclarativeTypeData *, qreal) {}
+        virtual void typeDataReady(QDeclarativeTypeData *) {}
+    };
+    void registerCallback(TypeDataCallback *);
+    void unregisterCallback(TypeDataCallback *);
+
+protected:
+    virtual void done();
+    virtual void dataReceived(const QByteArray &);
+    virtual void allDependenciesDone();
+    virtual void downloadProgressChanged(qreal);
+
+private:
+    void resolveTypes();
+    void compile();
+
+    QDeclarativeTypeLoader::Options m_options;
+
+    QDeclarativeQmldirData *qmldirForUrl(const QUrl &);
+
+    QDeclarativeScriptParser scriptParser;
+    QDeclarativeImports m_imports;
+
+    QList<ScriptReference> m_scripts;
+    QList<QDeclarativeQmldirData *> m_qmldirs;
+
+    QList<TypeReference> m_types;
+    bool m_typesResolved:1;
+
+    QDeclarativeCompiledData *m_compiledData;
+    mutable QDeclarativeComponent *m_component;
+
+    QList<TypeDataCallback *> m_callbacks;
+   
+    QDeclarativeTypeLoader *m_typeLoader;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeScriptData : public QDeclarativeDataBlob
+{
+public:
+    QDeclarativeScriptData(const QUrl &);
+
+    QDeclarativeParser::Object::ScriptBlock::Pragmas pragmas() const;
+    QString scriptSource() const;
+
+protected:
+    virtual void dataReceived(const QByteArray &);
+
+private:
+    QDeclarativeParser::Object::ScriptBlock::Pragmas m_pragmas;
+    QString m_source;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativeQmldirData : public QDeclarativeDataBlob
+{
+public:
+    QDeclarativeQmldirData(const QUrl &);
+
+    const QDeclarativeDirComponents &dirComponents() const;
+
+protected:
+    virtual void dataReceived(const QByteArray &);
+
+private:
+    QDeclarativeDirComponents m_components;
+
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVETYPELOADER_P_H
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 12f9794..687ff52 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -24,7 +24,7 @@ SOURCES += \
     $$PWD/qdeclarativestringconverters.cpp \
     $$PWD/qdeclarativeclassfactory.cpp \
     $$PWD/qdeclarativeparserstatus.cpp \
-    $$PWD/qdeclarativecompositetypemanager.cpp \
+    $$PWD/qdeclarativetypeloader.cpp \
     $$PWD/qdeclarativeinfo.cpp \
     $$PWD/qdeclarativeerror.cpp \
     $$PWD/qdeclarativescriptparser.cpp \
@@ -94,8 +94,7 @@ HEADERS += \
     $$PWD/qdeclarativeproperty_p.h \
     $$PWD/qdeclarativecontext_p.h \
     $$PWD/qdeclarativeinclude_p.h \
-    $$PWD/qdeclarativecompositetypedata_p.h \
-    $$PWD/qdeclarativecompositetypemanager_p.h \
+    $$PWD/qdeclarativetypeloader_p.h \
     $$PWD/qdeclarativelist.h \
     $$PWD/qdeclarativelist_p.h \
     $$PWD/qdeclarativedata_p.h \