aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4compileddata.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-04-06 11:33:20 +0200
committerLars Knoll <lars.knoll@qt.io>2018-05-02 14:17:55 +0000
commit2c23299ecd94dbcce0a90b3b374a674cad6a3683 (patch)
treea5ade5f3b39685ada7d069b89b86e8b983ee159a /src/qml/compiler/qv4compileddata.cpp
parent922e6f42b4fa9b9fa87246c577c13bb945bd4bc4 (diff)
Cleanup handling of with() statements
Add a CompilerContext for with, whose only purpose it is to trigger variable lookup by name. This avoids looking up variables declared inside the with() {} block by name and we do not lookup variables outside the with block by name neither anymore. Change-Id: I52e9fb2daa9601f9e5102714c002dc506ad5ed23 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4compileddata.cpp')
-rw-r--r--src/qml/compiler/qv4compileddata.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp
index 74f1ab81aa..0a4ba72cf0 100644
--- a/src/qml/compiler/qv4compileddata.cpp
+++ b/src/qml/compiler/qv4compileddata.cpp
@@ -540,9 +540,6 @@ Unit *CompilationUnit::createUnitData(QmlIR::Document *irDocument)
function->nFormals = formals.size();
function->length = function->nFormals;
- // Hack to ensure an activation is created.
- function->flags |= QV4::CompiledData::Function::HasWith | QV4::CompiledData::Function::HasDirectEval;
-
signalParameterNameTableOffset += function->nFormals * sizeof(quint32);
}
}