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

 Conflicts:
	.qmake.conf
	src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
	src/qml/compiler/qv4codegen.cpp
	tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp

Change-Id: I010505326d76ee728ffe5fbd4c7879f28adadb12

1 files changed, 5 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp
index 10e7fb1b3f..131d3406d2 100644
--- a/src/qml/jsruntime/qv4function.cpp
+++ b/src/qml/jsruntime/qv4function.cpp
@@ -111,6 +111,11 @@ void Function::updateInternalClass(ExecutionEngine *engine, const QList<QByteArr
 
     internalClass = engine->internalClasses(EngineBase::Class_CallContext);
 
+    // first locals
+    const quint32_le *localsIndices = compiledFunction->localsTable();
+    for (quint32 i = 0; i < compiledFunction->nLocals; ++i)
+        internalClass = internalClass->addMember(engine->identifierTable->identifier(compilationUnit->runtimeStrings[localsIndices[i]]), Attr_NotConfigurable);
+
     Scope scope(engine);
     ScopedString arg(scope);
     for (const QString &parameterName : parameterNames) {
@@ -118,10 +123,6 @@ void Function::updateInternalClass(ExecutionEngine *engine, const QList<QByteArr
         internalClass = internalClass->addMember(arg->identifier(), Attr_NotConfigurable);
     }
     nFormals = parameters.size();
-
-    const quint32_le *localsIndices = compiledFunction->localsTable();
-    for (quint32 i = 0; i < compiledFunction->nLocals; ++i)
-        internalClass = internalClass->addMember(engine->identifierTable->identifier(compilationUnit->runtimeStrings[localsIndices[i]]), Attr_NotConfigurable);
 }
 
 QT_END_NAMESPACE