Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I69c3e6610ff590d9c18f386fc17ed2e429b58d26

1 files changed, 4 insertions, 3 deletions

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index b508a66f84..457558fb56 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -2356,7 +2356,7 @@ void QQmlTypeData::done()
 
     QQmlEngine *const engine = typeLoader()->engine();
 
-    const auto dependencyHasher = [engine, resolvedTypeCache, this](QCryptographicHash *hash) {
+    const auto dependencyHasher = [engine, &resolvedTypeCache, this](QCryptographicHash *hash) {
         if (!resolvedTypeCache.addToHash(hash, engine))
             return false;
         return ::addTypeReferenceChecksumsToHash(m_compositeSingletons, hash, engine);
@@ -2373,7 +2373,7 @@ void QQmlTypeData::done()
 
     if (!m_document.isNull()) {
         // Compile component
-        compile(typeNameCache, resolvedTypeCache, dependencyHasher);
+        compile(typeNameCache, &resolvedTypeCache, dependencyHasher);
     } else {
         createTypeAndPropertyCaches(typeNameCache, resolvedTypeCache);
     }
@@ -2646,7 +2646,8 @@ QString QQmlTypeData::stringAt(int index) const
     return m_document->jsGenerator.stringTable.stringForIndex(index);
 }
 
-void QQmlTypeData::compile(const QQmlRefPointer<QQmlTypeNameCache> &typeNameCache, const QV4::CompiledData::ResolvedTypeReferenceMap &resolvedTypeCache,
+void QQmlTypeData::compile(const QQmlRefPointer<QQmlTypeNameCache> &typeNameCache,
+                           QV4::CompiledData::ResolvedTypeReferenceMap *resolvedTypeCache,
                            const QV4::CompiledData::DependentTypesHasher &dependencyHasher)
 {
     Q_ASSERT(m_compiledData.isNull());