From 447e2e024609a22fe052cf458c27efdef2e3d3eb Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 20 Jul 2018 09:22:47 -0700 Subject: Try to load QML cache from CacheLocation if side-by-side fails This could happen if the .qmlc file is stale or corrupt for some reason. In that case, we should try to load a cache file from the user's CacheLocation. Change-Id: Id2be776c7ae0467c9d9ffffd1543204272a531d1 Reviewed-by: Simon Hausmann --- src/qml/compiler/qv4compiler.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/qml/compiler/qv4compiler.cpp') diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp index f1afad4965..76779fece8 100644 --- a/src/qml/compiler/qv4compiler.cpp +++ b/src/qml/compiler/qv4compiler.cpp @@ -48,9 +48,6 @@ #include #include -// generated by qmake: -#include "qml_compile_hash_p.h" - QV4::Compiler::StringTableGenerator::StringTableGenerator() { clear(); @@ -482,7 +479,7 @@ QV4::CompiledData::Unit QV4::Compiler::JSUnitGenerator::generateHeader(QV4::Comp unit.flags |= module->unitFlags; unit.version = QV4_DATA_STRUCTURE_VERSION; unit.qtVersion = QT_VERSION; - qstrcpy(unit.libraryVersionHash, QML_COMPILE_HASH); + qstrcpy(unit.libraryVersionHash, CompiledData::qml_compile_hash); memset(unit.md5Checksum, 0, sizeof(unit.md5Checksum)); memset(unit.dependencyMD5Checksum, 0, sizeof(unit.dependencyMD5Checksum)); -- cgit v1.2.3