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

QmlDebugger: synchronize watches when deleted

Browse Source 
Reviewed-by: Kai Koehne
This commit is contained in:
Christiaan Janssen
2011-04-21 12:25:06 +02:00
parent d0d0a8c07e
commit 5692120ee3
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -230,7 +230,10 @@ void QmlEngine::connectionEstablished()
showMessage(tr("QML Debugger connected."), StatusBar);
synchronizeWatchers();
if (!watchHandler()->watcherNames().isEmpty()) {
synchronizeWatchers();
}
connect(watchersModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers()));
notifyEngineRunAndInferiorRunOk();
@@ -359,6 +362,7 @@ bool QmlEngine::acceptsWatchesWhileRunning() const
void QmlEngine::closeConnection()
{
disconnect(watchersModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers()));
disconnect(&d->m_adapter, SIGNAL(connectionStartupFailed()),
this, SLOT(connectionStartupFailed()));
d->m_adapter.closeConnection();
@@ -709,17 +713,15 @@ void QmlEngine::updateWatchData(const WatchData &data,
void QmlEngine::synchronizeWatchers()
{
if (!watchHandler()->watcherNames().isEmpty()) {
// send watchers list
QByteArray reply;
QDataStream rs(&reply, QIODevice::WriteOnly);
QByteArray cmd = "WATCH_EXPRESSIONS";
rs << cmd;
rs << watchHandler()->watchedExpressions();
logMessage(LogSend, QString("%1 %2").arg(
QString(cmd), watchHandler()->watchedExpressions().join(", ")));
sendMessage(reply);
}
// send watchers list
QByteArray reply;
QDataStream rs(&reply, QIODevice::WriteOnly);
QByteArray cmd = "WATCH_EXPRESSIONS";
rs << cmd;
rs << watchHandler()->watchedExpressions();
logMessage(LogSend, QString("%1 %2").arg(
QString(cmd), watchHandler()->watchedExpressions().join(", ")));
sendMessage(reply);
}
void QmlEngine::expandObject(const QByteArray &iname, quint64 objectId)