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

 Conflicts:
	src/qml/configure.json
	src/qml/qml/qqmlengine.cpp
	src/qml/types/qqmlmodelsmodule.cpp
	src/qml/types/types.pri

Change-Id: I390112f8178c99b36741d3c40901e544c6daafaa

1 files changed, 0 insertions, 7 deletions

diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp
index d1a7aa9b6f..2ae3df6ebb 100644
--- a/src/qml/types/qqmlconnections.cpp
+++ b/src/qml/types/qqmlconnections.cpp
@@ -289,13 +289,6 @@ void QQmlConnections::connectSignals()
             signal->setEnabled(d->enabled);
 
             auto f = d->compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex];
-
-            // If the function is marked as having a nested function, then the user wrote:
-            //   onSomeSignal: function() { /*....*/ }
-            // So take that nested function:
-            if (auto closure = f->nestedFunction())
-                f = closure;
-
             QQmlBoundSignalExpression *expression =
                     ctxtdata ? new QQmlBoundSignalExpression(target, signalIndex, ctxtdata, this, f)
                              : nullptr;