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, 22 insertions, 0 deletions

diff --git a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
index 7d99ab0a90..a176f674e6 100644
--- a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
+++ b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
@@ -310,6 +310,7 @@ private slots:
     // context access:
     void readArguments_data() { redundancy_data(); }
     void readArguments();
+    void readComplicatedArguments();
     void readLocals_data() { redundancy_data(); }
     void readLocals();
     void readObject_data() { redundancy_data(); }
@@ -562,6 +563,27 @@ void tst_qv4debugger::readArguments()
     QCOMPARE(frame0.value(QStringLiteral("b")).toString(), QStringLiteral("two"));
 }
 
+void tst_qv4debugger::readComplicatedArguments()
+{
+    m_debuggerAgent->collector.setRedundantRefs(false);
+    m_debuggerAgent->m_captureContextInfo = true;
+    QString script =
+            "var f = function(a) {\n"
+            "  a = 12;\n"
+            "  return a;\n"
+            "}\n"
+            "f(1, 2);\n";
+    debugger()->addBreakPoint("readArguments", 3);
+    evaluateJavaScript(script, "readArguments");
+    QVERIFY(m_debuggerAgent->m_wasPaused);
+    QVERIFY(m_debuggerAgent->m_capturedScope.size() > 1);
+    const TestAgent::NamedRefs &frame0 = m_debuggerAgent->m_capturedScope.at(0);
+    QCOMPARE(frame0.size(), 2);
+    QVERIFY(frame0.contains(QStringLiteral("a")));
+    QCOMPARE(frame0.type(QStringLiteral("a")), QStringLiteral("number"));
+    QCOMPARE(frame0.value(QStringLiteral("a")).toInt(), 12);
+}
+
 void tst_qv4debugger::readLocals()
 {
     QFETCH(bool, redundantRefs);