diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-01 15:51:05 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-03 08:28:25 +0100 |
| commit | a6fbea98ed3c2cce4bd1b2d4ec2dc055b4eaf129 (patch) | |
| tree | 3cd715b70f268a1c19c69d9649cff8196aee11e3 /src/qml/jsruntime/qv4debugging.cpp | |
| parent | cfdcc65cc54fc973a147044fc592779e87a669c4 (diff) | |
Fix conditional breakpoints in QML
We need to set "inheritContext" to true for the QV4::Script that's used during
conditional break point evaluation, because that will also disable fast
property lookups, which is still required for QML lookups to work.
Change-Id: I8976df1c827b5058eae9bdce6e86e5ea856cbfe1
Task-number: QTBUG-43018
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4debugging.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4debugging.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4debugging.cpp b/src/qml/jsruntime/qv4debugging.cpp index 88db9df91a..6a8d364a08 100644 --- a/src/qml/jsruntime/qv4debugging.cpp +++ b/src/qml/jsruntime/qv4debugging.cpp @@ -74,7 +74,9 @@ public: ExecutionContext *ctx = engine->currentContext(); QV4::Script script(ctx, this->script); script.strictMode = ctx->d()->strictMode; - script.inheritContext = false; + // In order for property lookups in QML to work, we need to disable fast v4 lookups. That + // is a side-effect of inheritContext. + script.inheritContext = true; script.parse(); QV4::ScopedValue result(scope); if (!scope.engine->hasException) |