Remove QQmlCompiledData in favor of QV4::CompiledData::CompilationUnit

QQmlCompiledData used to contain the binary data for instantiating QML types in
the QML VME. Nowadays the QML type compiler as well as the JavaScript compiler
create a QV4::CompiledData::CompilationUnit.

Change-Id: I155f62a5ecfb55a3fe230520231b6d8fd5b28ac9
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h
index 121be874fe..b55106ac7b 100644
--- a/src/qml/compiler/qqmltypecompiler_p.h
+++ b/src/qml/compiler/qqmltypecompiler_p.h
@@ -53,13 +53,12 @@
 #include <qglobal.h>
 #include <qqmlerror.h>
 #include <qhash.h>
-#include <private/qqmlcompiler_p.h>
+#include <private/qqmltypeloader_p.h>
 #include <private/qqmlirbuilder_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQmlEnginePrivate;
-class QQmlCompiledData;
 class QQmlError;
 class QQmlTypeData;
 class QQmlImports;
@@ -79,9 +78,9 @@ struct QQmlTypeCompiler
 {
     Q_DECLARE_TR_FUNCTIONS(QQmlTypeCompiler)
 public:
-    QQmlTypeCompiler(QQmlEnginePrivate *engine, QQmlCompiledData *compiledData, QQmlTypeData *typeData, QmlIR::Document *document);
+    QQmlTypeCompiler(QQmlEnginePrivate *engine, QQmlTypeData *typeData, QmlIR::Document *document);
 
-    bool compile();
+    QV4::CompiledData::CompilationUnit *compile();
 
     QList<QQmlError> compilationErrors() const { return errors; }
     void recordError(const QQmlError &error);
@@ -115,7 +114,6 @@ public:
 private:
     QList<QQmlError> errors;
     QQmlEnginePrivate *engine;
-    QQmlCompiledData *compiledData;
     QQmlTypeData *typeData;
     QQmlRefPointer<QQmlTypeNameCache> importCache;
     QmlIR::Document *document;