Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	src/qml/compiler/qv4compilerscanfunctions.cpp
	tools/tools.pro

Done-with: Lars Knoll <lars.knoll@qt.io>
Change-Id: Ia77ee6ede6fc9760ce5a03d68079579a63e5a02f

1 files changed, 6 insertions, 0 deletions

diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp
index 372e240700..eeb051046b 100644
--- a/src/qml/compiler/qv4compilerscanfunctions.cpp
+++ b/src/qml/compiler/qv4compilerscanfunctions.cpp
@@ -587,6 +587,12 @@ void ScanFunctions::calcEscapingVariables()
             auto m = c->members.find(c->caughtVariable);
             m->canEscape = true;
         }
+        const QLatin1String exprForOn("expression for on");
+        if (c->contextType == ContextType::Binding && c->name.length() > exprForOn.size() &&
+            c->name.startsWith(exprForOn) && c->name.at(exprForOn.size()).isUpper())
+            // we don't really need this for bindings, but we do for signal handlers, and in this case,
+            // we don't know if the code is a signal handler or not.
+            c->requiresExecutionContext = true;
         if (allVarsEscape) {
             for (auto &m : c->members)
                 m.canEscape = true;