diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-06-19 18:28:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-19 17:23:10 +0000 |
| commit | ba64b7d013fb95fb7b3afe9f1724edae7fcca2ed (patch) | |
| tree | 9aaddf6c214b41999a584129e63282b443734ca9 /src/qml/compiler/qv4codegen.cpp | |
| parent | 9333ea8649838d7e0400b0e94c8cbd4fa5d216b0 (diff) | |
| parent | 5100d558742c682d83e0d4033d78ed4c9f521f56 (diff) | |
| download | qtdeclarative-ba64b7d013fb95fb7b3afe9f1724edae7fcca2ed.tar.gz | |
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
Diffstat (limited to 'src/qml/compiler/qv4codegen.cpp')
| -rw-r--r-- | src/qml/compiler/qv4codegen.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index 9d15e2ef6b..ec2c0dad3e 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -2360,6 +2360,8 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast, _module->blocks.append(_context); _context->blockIndex = _module->blocks.count() - 1; } + if (_module->debugMode) // allow the debugger to see overwritten arguments + _context->argumentsCanEscape = true; // When a user writes the following QML signal binding: // onSignal: function() { doSomethingUsefull } |