Commit 66964ac9 authored by hjk's avatar hjk
Browse files

Debugger: Rework QmlEngine watcher expansion

Use callbacks in QmlEnginePrivate::evaluate(). This separates the
four code paths through the machinery into three separate handlers
and one direct access to the console.

This also fixes a bug where items were put into 'debuggerCommands'
but attempted to be removed from 'updateLocalsAndWatchers'.

Introduce a QmlEngine::updateLocals similar to what the other
engines do. Let the frame() and assignValue() paths use it.
Keep track of pending changes and call notifyUpdateFinished
if and only if the pending lookup queues is empty.

Finally, remove some dead code.

Change-Id: I173a52911d0de994b849fc6ab4f52ef7f64a8ba5
Reviewed-by: default avatarChristian Stenger <>
parent 1adbcc03
This diff is collapsed.
......@@ -77,8 +77,6 @@ private slots:
void appStartupFailed(const QString &errorMessage);
void appendMessage(const QString &msg, Utils::OutputFormat);
void synchronizeWatchers();
void notifyEngineRemoteServerRunning(const QByteArray &, int pid);
void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment