1 files changed, 27 insertions, 53 deletions

diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index 51228eacc7..ab6b046fcf 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -53,7 +53,9 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qatomic.h>
+#ifndef QT_NO_NETWORK
 #include <QtNetwork/qnetworkreply.h>
+#endif
 #include <QtQml/qqmlerror.h>
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlfile.h>
@@ -75,11 +77,11 @@ class QQmlScriptData;
 class QQmlScriptBlob;
 class QQmlQmldirData;
 class QQmlTypeLoader;
-class QQmlCompiledData;
 class QQmlComponentPrivate;
 class QQmlTypeData;
 class QQmlTypeLoader;
 class QQmlExtensionInterface;
+struct QQmlCompileError;
 
 namespace QmlIR {
 struct Document;
@@ -129,34 +131,32 @@ public:
 
     class Data {
     public:
-        inline const char *data() const;
-        inline int size() const;
-
-        inline QByteArray asByteArray() const;
-
-        inline bool isFile() const;
-        inline QQmlFile *asFile() const;
-
+        QByteArray readAll(QString *error, qint64 *sourceTimeStamp = 0) const;
     private:
         friend class QQmlDataBlob;
         friend class QQmlTypeLoader;
         inline Data();
         Data(const Data &);
         Data &operator=(const Data &);
-        QBiPointer<const QByteArray, QQmlFile> d;
+        QBiPointer<const QByteArray, const QString> d;
     };
 
 protected:
     // Can be called from within callbacks
     void setError(const QQmlError &);
     void setError(const QList<QQmlError> &errors);
+    void setError(const QQmlCompileError &error);
+    void setError(const QVector<QQmlCompileError> &errors);
+    void setError(const QString &description);
     void addDependency(QQmlDataBlob *);
 
     // Callbacks made in load thread
     virtual void dataReceived(const Data &) = 0;
     virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*) = 0;
     virtual void done();
+#ifndef QT_NO_NETWORK
     virtual void networkError(QNetworkReply::NetworkError);
+#endif
     virtual void dependencyError(QQmlDataBlob *);
     virtual void dependencyComplete(QQmlDataBlob *);
     virtual void allDependenciesDone();
@@ -233,7 +233,6 @@ public:
 
     protected:
         bool addImport(const QV4::CompiledData::Import *import, QList<QQmlError> *errors);
-        bool addPragma(const QmlIR::Pragma &pragma, QList<QQmlError> *errors);
 
         bool fetchQmldir(const QUrl &url, const QV4::CompiledData::Import *import, int priority, QList<QQmlError> *errors);
         bool updateQmldir(QQmlQmldirData *data, const QV4::CompiledData::Import *import, QList<QQmlError> *errors);
@@ -250,7 +249,6 @@ public:
         virtual QString stringAt(int) const { return QString(); }
 
         QQmlImports m_importCache;
-        bool m_isSingleton;
         QHash<const QV4::CompiledData::Import*, int> m_unresolvedImports;
         QList<QQmlQmldirData *> m_qmldirs;
     };
@@ -320,20 +318,24 @@ public:
 private:
     friend class QQmlDataBlob;
     friend class QQmlTypeLoaderThread;
+#ifndef QT_NO_NETWORK
     friend class QQmlTypeLoaderNetworkReplyProxy;
+#endif // QT_NO_NETWORK
 
     void shutdownThread();
 
     void loadThread(QQmlDataBlob *);
     void loadWithStaticDataThread(QQmlDataBlob *, const QByteArray &);
     void loadWithCachedUnitThread(QQmlDataBlob *blob, const QQmlPrivate::CachedQmlUnit *unit);
+#ifndef QT_NO_NETWORK
     void networkReplyFinished(QNetworkReply *);
     void networkReplyProgress(QNetworkReply *, qint64, qint64);
 
     typedef QHash<QNetworkReply *, QQmlDataBlob *> NetworkReplies;
+#endif
 
     void setData(QQmlDataBlob *, const QByteArray &);
-    void setData(QQmlDataBlob *, QQmlFile *);
+    void setData(QQmlDataBlob *, const QString &fileName);
     void setData(QQmlDataBlob *, const QQmlDataBlob::Data &);
     void setCachedUnit(QQmlDataBlob *blob, const QQmlPrivate::CachedQmlUnit *unit);
 
@@ -362,7 +364,9 @@ private:
 
     QQmlEngine *m_engine;
     QQmlTypeLoaderThread *m_thread;
+#ifndef QT_NO_NETWORK
     NetworkReplies m_networkReplies;
+#endif
     TypeCache m_typeCache;
     int m_typeCacheTrimThreshold;
     ScriptCache m_scriptCache;
@@ -381,6 +385,7 @@ private:
 
 class Q_AUTOTEST_EXPORT QQmlTypeData : public QQmlTypeLoader::Blob
 {
+    Q_DECLARE_TR_FUNCTIONS(QQmlTypeData)
 public:
     struct TypeReference
     {
@@ -412,13 +417,9 @@ private:
 public:
     ~QQmlTypeData();
 
-    const QHash<int, TypeReference> &resolvedTypeRefs() const { return m_resolvedTypes; }
-
     const QList<ScriptReference> &resolvedScripts() const;
-    const QSet<QString> &namespaces() const;
-    const QList<TypeReference> &compositeSingletons() const;
 
-    QQmlCompiledData *compiledData() const;
+    QV4::CompiledData::CompilationUnit *compilationUnit() const;
 
     // Used by QQmlComponent to get notifications
     struct TypeDataCallback {
@@ -440,14 +441,21 @@ protected:
     virtual QString stringAt(int index) const;
 
 private:
+    bool tryLoadFromDiskCache();
     void continueLoadFromIR();
     void resolveTypes();
+    QQmlCompileError buildTypeResolutionCaches(
+            QQmlRefPointer<QQmlTypeNameCache> *importCache,
+            QV4::CompiledData::ResolvedTypeReferenceMap *resolvedTypeCache
+            ) const;
     void compile();
+    void rebuildTypeAndPropertyCaches();
     bool resolveType(const QString &typeName, int &majorVersion, int &minorVersion, TypeReference &ref);
 
     virtual void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace);
 
     QScopedPointer<QmlIR::Document> m_document;
+    QV4::CompiledData::TypeReferenceMap m_typeReferences;
 
     QList<ScriptReference> m_scripts;
 
@@ -458,11 +466,10 @@ private:
     QHash<int, TypeReference> m_resolvedTypes;
     bool m_typesResolved:1;
 
-    QQmlCompiledData *m_compiledData;
+    QQmlRefPointer<QV4::CompiledData::CompilationUnit> m_compiledData;
 
     QList<TypeDataCallback *> m_callbacks;
 
-    QV4::CompiledData::Import *m_implicitImport;
     bool m_implicitImportLoaded;
     bool loadImplicitImport();
 };
@@ -572,40 +579,7 @@ QQmlDataBlob::Data::Data()
 {
 }
 
-const char *QQmlDataBlob::Data::data() const
-{
-    Q_ASSERT(!d.isNull());
-
-    if (d.isT1()) return d.asT1()->constData();
-    else return d.asT2()->data();
-}
-
-int QQmlDataBlob::Data::size() const
-{
-    Q_ASSERT(!d.isNull());
-
-    if (d.isT1()) return d.asT1()->size();
-    else return d.asT2()->size();
-}
-
-bool QQmlDataBlob::Data::isFile() const
-{
-    return d.isT2();
-}
-
-QByteArray QQmlDataBlob::Data::asByteArray() const
-{
-    Q_ASSERT(!d.isNull());
-
-    if (d.isT1()) return *d.asT1();
-    else return d.asT2()->dataByteArray();
-}
 
-QQmlFile *QQmlDataBlob::Data::asFile() const
-{
-    if (d.isT2()) return d.asT2();
-    else return 0;
-}
 
 QT_END_NAMESPACE