1 files changed, 16 insertions, 2 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index f736e04b88..2c164abd6f 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -819,7 +819,7 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
             const QStringRef &name = node->name;
 
             bool typeFound = false;
-            QV4::CompiledData::Property::Type type;
+            QV4::CompiledData::Property::Type type = QV4::CompiledData::Property::Var;
 
             for (int ii = 0; !typeFound && ii < propTypeNameToTypesCount; ++ii) {
                 const TypeNameToType *t = propTypeNameToTypes + ii;
@@ -1359,7 +1359,7 @@ bool IRBuilder::isRedundantNullInitializerForPropertyDeclaration(Property *prope
     return QQmlJS::AST::cast<QQmlJS::AST::NullExpression *>(expr);
 }
 
-QV4::CompiledData::Unit *QmlUnitGenerator::generate(Document &output)
+QV4::CompiledData::Unit *QmlUnitGenerator::generate(Document &output, QQmlEngine *engine, const QV4::CompiledData::ResolvedTypeReferenceMap &dependentTypes)
 {
     QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit = output.javaScriptCompilationUnit;
     QV4::CompiledData::Unit *jsUnit = compilationUnit->createUnitData(&output);
@@ -1402,6 +1402,20 @@ QV4::CompiledData::Unit *QmlUnitGenerator::generate(Document &output)
     qmlUnit->offsetToStringTable = totalSize - output.jsGenerator.stringTable.sizeOfTableAndData();
     qmlUnit->stringTableSize = output.jsGenerator.stringTable.stringCount();
 
+#ifndef V4_BOOTSTRAP
+    if (!dependentTypes.isEmpty()) {
+        QCryptographicHash hash(QCryptographicHash::Md5);
+        if (dependentTypes.addToHash(&hash, engine)) {
+            QByteArray checksum = hash.result();
+            Q_ASSERT(checksum.size() == sizeof(qmlUnit->dependencyMD5Checksum));
+            memcpy(qmlUnit->dependencyMD5Checksum, checksum.constData(), sizeof(qmlUnit->dependencyMD5Checksum));
+        }
+    }
+#else
+    Q_UNUSED(dependentTypes);
+    Q_UNUSED(engine);
+#endif
+
     // write imports
     char *importPtr = data + qmlUnit->offsetToImports;
     foreach (const QV4::CompiledData::Import *imp, output.imports) {