diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-16 10:09:15 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-16 10:09:15 +0200 |
| commit | ccefc5cf471ae68f44d25f8533fd0e0c44fb8bf8 (patch) | |
| tree | a143737514a07c071df395d54ae23666773b264c /src/plugins/debugger/qml/qmlengine.cpp | |
| parent | 5cd1bb6f73bcf2fbe5d514d69cec372a672afdd8 (diff) | |
| parent | 23ac1d18e1be8d898adf44dde745ba7c259beb3c (diff) | |
Merge remote-tracking branch 'origin/4.6' into 4.7
Conflicts:
src/plugins/qnx/qnxplugin.cpp
Change-Id: I8ede5fa9c8daf3001e41fcba7cbee68edb9db3a6
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index fa69e81653..b428a88ea3 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -2166,6 +2166,10 @@ void QmlEnginePrivate::handleFrame(const QVariantMap &response) watchHandler->insertItem(item); evaluate(exp, -1, [this, iname, exp](const QVariantMap &response) { handleEvaluateExpression(response, iname, exp); + + // If there are no scopes, "this" may be the only thing to look up. + if (currentFrameScopes.isEmpty()) + checkForFinishedUpdate(); }); } |