1 files changed, 10 insertions, 5 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index fd55ce5562..20685e42f1 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -3065,12 +3065,17 @@ bool Codegen::visit(ThisExpression *)
     if (hasError())
         return false;
 
-    if (_context->isArrowFunction) {
-        Reference r = referenceForName(QStringLiteral("this"), false);
-        r.isReadonly = true;
-        setExprResult(r);
-        return false;
+    for (Context *parentContext = _context; parentContext; parentContext = parentContext->parent) {
+        if (parentContext->isArrowFunction) {
+            Reference r = referenceForName(QStringLiteral("this"), false);
+            r.isReadonly = true;
+            setExprResult(r);
+            return false;
+        }
+        if (parentContext->contextType != ContextType::Block)
+            break;
     }
+
     setExprResult(Reference::fromThis(this));
     return false;
 }