1 files changed, 12 insertions, 8 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 457558fb56..2233af6cd8 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -52,6 +52,7 @@
 #include <private/qqmlpropertyvalidator_p.h>
 #include <private/qqmlpropertycachecreator_p.h>
 #include <private/qv4module_p.h>
+#include <private/qqmlirloader_p.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
@@ -2356,10 +2357,12 @@ void QQmlTypeData::done()
 
     QQmlEngine *const engine = typeLoader()->engine();
 
-    const auto dependencyHasher = [engine, &resolvedTypeCache, this](QCryptographicHash *hash) {
-        if (!resolvedTypeCache.addToHash(hash, engine))
-            return false;
-        return ::addTypeReferenceChecksumsToHash(m_compositeSingletons, hash, engine);
+    const auto dependencyHasher = [engine, &resolvedTypeCache, this]() {
+        QCryptographicHash hash(QCryptographicHash::Md5);
+        return (resolvedTypeCache.addToHash(&hash, engine)
+                    && ::addTypeReferenceChecksumsToHash(m_compositeSingletons, &hash, engine))
+                ? hash.result()
+                : QByteArray();
     };
 
     // verify if any dependencies changed if we're using a cache
@@ -2502,7 +2505,7 @@ void QQmlTypeData::dataReceived(const SourceCodeData &data)
 void QQmlTypeData::initializeFromCachedUnit(const QV4::CompiledData::Unit *unit)
 {
     m_document.reset(new QmlIR::Document(isDebugging()));
-    QmlIR::IRLoader loader(unit, m_document.data());
+    QQmlIRLoader loader(unit, m_document.data());
     loader.load();
     m_document->jsModule.fileName = urlString();
     m_document->jsModule.finalUrl = finalUrlString();
@@ -2515,7 +2518,7 @@ bool QQmlTypeData::loadFromSource()
     m_document.reset(new QmlIR::Document(isDebugging()));
     m_document->jsModule.sourceTimeStamp = m_backupSourceCode.sourceTimeStamp();
     QQmlEngine *qmlEngine = typeLoader()->engine();
-    QmlIR::IRBuilder compiler(qmlEngine->handle()->v8Engine->illegalNames());
+    QmlIR::IRBuilder compiler(qmlEngine->handle()->illegalNames());
 
     QString sourceError;
     const QString source = m_backupSourceCode.readAll(&sourceError);
@@ -2544,7 +2547,7 @@ bool QQmlTypeData::loadFromSource()
 void QQmlTypeData::restoreIR(QQmlRefPointer<QV4::CompiledData::CompilationUnit> unit)
 {
     m_document.reset(new QmlIR::Document(isDebugging()));
-    QmlIR::IRLoader loader(unit->unitData(), m_document.data());
+    QQmlIRLoader loader(unit->unitData(), m_document.data());
     loader.load();
     m_document->jsModule.fileName = urlString();
     m_document->jsModule.finalUrl = finalUrlString();
@@ -3048,7 +3051,8 @@ void QQmlScriptBlob::dataReceived(const SourceCodeData &data)
 
     if (m_isModule) {
         QList<QQmlJS::DiagnosticMessage> diagnostics;
-        unit = QV4::ExecutionEngine::compileModule(isDebugging(), urlString(), source, data.sourceTimeStamp(), &diagnostics);
+        unit = QV4::Compiler::Codegen::compileModule(isDebugging(), urlString(), source,
+                                                     data.sourceTimeStamp(), &diagnostics);
         QList<QQmlError> errors = QQmlEnginePrivate::qmlErrorFromDiagnostics(urlString(), diagnostics);
         if (!errors.isEmpty()) {
             setError(errors);