feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDebugger: keeping watches when changing stack frames

Browse Source 
Reviewed-by: Kai Koehne
This commit is contained in:
Christiaan Janssen
2011-04-20 16:47:47 +02:00
parent 01ad08400e
commit 85801227a9
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp
View File

@@ -538,11 +538,21 @@ void JSDebuggerAgentPrivate::messageReceived(const QByteArray &message)
deep++;
}
QList<JSAgentWatchData> watches;
QList<JSAgentWatchData> locals = getLocals(ctx);
// re-evaluate watches given the frame's context
QScriptContext *currentCtx = engine()->pushContext();
currentCtx->setActivationObject(ctx->activationObject());
currentCtx->setThisObject(ctx->thisObject());
foreach (const QString &expr, watchExpressions)
watches << fromScriptValue(expr, engine()->evaluate(expr));
recordKnownObjects(watches);
engine()->popContext();
QByteArray reply;
QDataStream rs(&reply, QIODevice::WriteOnly);
rs << QByteArray("LOCALS") << frameId << locals;
rs << QByteArray("LOCALS") << frameId << locals << watches;
sendMessage(reply);
} else if (command == "SET_PROPERTY") {
SetupExecEnv execEnv(this);