diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-09-03 10:08:07 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-09-05 12:57:33 +0000 |
| commit | 1261fb2b89a8fa147f92c40d2476196d2745ca3f (patch) | |
| tree | f54b4dfae6eacf0bb0c93b4e84eaf9f64d5999b0 /src/qml | |
| parent | 939014cb9cad2f3357f47b28a4580397c17b913c (diff) | |
Enable lookups for global properties in QML
Task-number: QTBUG-70315
Change-Id: I2408c7a8561a000cb161e0bad066e5754be3b7ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/compiler/qv4codegen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index 53afdfbddf..786753ab80 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -2300,7 +2300,7 @@ Codegen::Reference Codegen::referenceForName(const QString &name, bool isLhs, co return fallback; Reference r = Reference::fromName(this, name); - r.global = (resolved.type == Context::ResolvedName::Global); + r.global = useFastLookups && (resolved.type == Context::ResolvedName::Global); return r; } @@ -4279,7 +4279,7 @@ QT_WARNING_POP return; } } - if (!disable_lookups && codegen->useFastLookups && global) { + if (!disable_lookups && global) { Instruction::LoadGlobalLookup load; load.index = codegen->registerGlobalGetterLookup(nameAsIndex()); codegen->bytecodeGenerator->addInstruction(load); |