1 files changed, 15 insertions, 19 deletions

diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index 915b1bcc4c..48e7d5cba4 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -54,6 +54,7 @@
 #include <QtQml/qtqmlglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qatomic.h>
+#include <QtCore/qfileinfo.h>
 #if QT_CONFIG(qml_network)
 #include <QtNetwork/qnetworkreply.h>
 #endif
@@ -130,16 +131,16 @@ public:
 
     QList<QQmlError> errors() const;
 
-    class Data {
+    class SourceCodeData {
     public:
-        QByteArray readAll(QString *error, qint64 *sourceTimeStamp = 0) const;
+        QString readAll(QString *error) const;
+        QDateTime sourceTimeStamp() const;
+        bool exists() const;
     private:
         friend class QQmlDataBlob;
         friend class QQmlTypeLoader;
-        inline Data();
-        Data(const Data &);
-        Data &operator=(const Data &);
-        QBiPointer<const QByteArray, const QString> d;
+        QString inlineSourceCode;
+        QFileInfo fileInfo;
     };
 
 protected:
@@ -152,7 +153,7 @@ protected:
     void addDependency(QQmlDataBlob *);
 
     // Callbacks made in load thread
-    virtual void dataReceived(const Data &) = 0;
+    virtual void dataReceived(const SourceCodeData &) = 0;
     virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*) = 0;
     virtual void done();
 #if QT_CONFIG(qml_network)
@@ -339,7 +340,7 @@ private:
 
     void setData(QQmlDataBlob *, const QByteArray &);
     void setData(QQmlDataBlob *, const QString &fileName);
-    void setData(QQmlDataBlob *, const QQmlDataBlob::Data &);
+    void setData(QQmlDataBlob *, const QQmlDataBlob::SourceCodeData &);
     void setCachedUnit(QQmlDataBlob *blob, const QQmlPrivate::CachedQmlUnit *unit);
 
     template<typename T>
@@ -400,6 +401,7 @@ public:
         int minorVersion;
         QQmlTypeData *typeData;
         QString prefix; // used by CompositeSingleton types
+        QString qualifiedName() const;
         bool needsCreation;
     };
 
@@ -436,7 +438,7 @@ public:
 protected:
     void done() override;
     void completed() override;
-    void dataReceived(const Data &) override;
+    void dataReceived(const SourceCodeData &) override;
     void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) override;
     void allDependenciesDone() override;
     void downloadProgressChanged(qreal) override;
@@ -454,7 +456,7 @@ private:
             QV4::CompiledData::ResolvedTypeReferenceMap *resolvedTypeCache
             ) const;
     void compile(const QQmlRefPointer<QQmlTypeNameCache> &typeNameCache,
-                 const QV4::CompiledData::ResolvedTypeReferenceMap &resolvedTypeCache);
+                 const QV4::CompiledData::ResolvedTypeReferenceMap &resolvedTypeCache, const QV4::CompiledData::DependentTypesHasher &dependencyHasher);
     void createTypeAndPropertyCaches(const QQmlRefPointer<QQmlTypeNameCache> &typeNameCache,
                                       const QV4::CompiledData::ResolvedTypeReferenceMap &resolvedTypeCache);
     bool resolveType(const QString &typeName, int &majorVersion, int &minorVersion, TypeReference &ref, int lineNumber = -1, int columnNumber = -1, bool reportErrors = true);
@@ -462,8 +464,7 @@ private:
     void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace) override;
 
 
-    qint64 m_sourceTimeStamp = 0;
-    QByteArray m_backupSourceCode; // used when cache verification fails.
+    SourceCodeData m_backupSourceCode; // used when cache verification fails.
     QScopedPointer<QmlIR::Document> m_document;
     QV4::CompiledData::TypeReferenceMap m_typeReferences;
 
@@ -547,7 +548,7 @@ public:
     QQmlScriptData *scriptData() const;
 
 protected:
-    void dataReceived(const Data &) override;
+    void dataReceived(const SourceCodeData &) override;
     void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) override;
     void done() override;
 
@@ -578,7 +579,7 @@ public:
     void setPriority(int);
 
 protected:
-    void dataReceived(const Data &) override;
+    void dataReceived(const SourceCodeData &) override;
     void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*) override;
 
 private:
@@ -587,11 +588,6 @@ private:
     int m_priority;
 };
 
-QQmlDataBlob::Data::Data()
-{
-}
-
-
 
 QT_END_NAMESPACE