diff options
| author | hjk <hjk@theqtcompany.com> | 2015-07-14 16:59:46 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2015-07-16 07:21:34 +0000 |
| commit | 66964ac91c62603d7af8da957fca840962ee923d (patch) | |
| tree | 9c238a0ad7805fc778b10ed94f5948f901bb8007 /src/plugins/debugger/qml/qmlengine.h | |
| parent | 1adbcc03f8c935937733b25c0bba800b607a93eb (diff) | |
| download | qt-creator-66964ac91c62603d7af8da957fca840962ee923d.tar.gz | |
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: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.h')
| -rw-r--r-- | src/plugins/debugger/qml/qmlengine.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index 2fe073aa49..bf51bf3ed4 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -77,8 +77,6 @@ private slots: void appStartupFailed(const QString &errorMessage); void appendMessage(const QString &msg, Utils::OutputFormat); - void synchronizeWatchers(); - private: void notifyEngineRemoteServerRunning(const QByteArray &, int pid); void notifyEngineRemoteSetupFinished(const RemoteSetupResult &result); |