forked from qt-creator/qt-creator
debugger: do not disable updates on locals and expressions
Task-number: QTCREATORBUG-5474 Change-Id: I6a2e872ac64a6ae57ff1ee9618937f0752fbb4ed Reviewed-by: David Schulz <david.schulz@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -207,14 +207,14 @@ void WatchModel::beginCycle(bool fullCycle)
|
||||
if (fullCycle)
|
||||
m_generationCounter++;
|
||||
|
||||
emit enableUpdates(false);
|
||||
//emit enableUpdates(false);
|
||||
}
|
||||
|
||||
void WatchModel::endCycle()
|
||||
{
|
||||
removeOutdated();
|
||||
m_fetchTriggered.clear();
|
||||
emit enableUpdates(true);
|
||||
//emit enableUpdates(true);
|
||||
}
|
||||
|
||||
DebuggerEngine *WatchModel::engine() const
|
||||
|
||||
@@ -122,9 +122,6 @@ private:
|
||||
void dumpHelper(WatchItem *item);
|
||||
void emitAllChanged();
|
||||
|
||||
signals:
|
||||
void enableUpdates(bool);
|
||||
|
||||
private:
|
||||
QString displayType(const WatchData &typeIn) const;
|
||||
QString formattedValue(const WatchData &data) const;
|
||||
|
||||
@@ -997,23 +997,11 @@ void WatchWindow::setModel(QAbstractItemModel *model)
|
||||
}
|
||||
|
||||
connect(model, SIGNAL(layoutChanged()), SLOT(resetHelper()));
|
||||
connect(model, SIGNAL(enableUpdates(bool)), SLOT(setUpdatesEnabled(bool)));
|
||||
// Potentially left in disabled state in case engine crashes when expanding.
|
||||
setUpdatesEnabled(true);
|
||||
}
|
||||
|
||||
void WatchWindow::setUpdatesEnabled(bool enable)
|
||||
{
|
||||
//qDebug() << "ENABLING UPDATES: " << enable;
|
||||
QTreeView::setUpdatesEnabled(enable);
|
||||
}
|
||||
|
||||
void WatchWindow::resetHelper()
|
||||
{
|
||||
bool old = updatesEnabled();
|
||||
setUpdatesEnabled(false);
|
||||
resetHelper(model()->index(0, 0));
|
||||
setUpdatesEnabled(old);
|
||||
}
|
||||
|
||||
void WatchWindow::resetHelper(const QModelIndex &idx)
|
||||
|
||||
@@ -62,7 +62,6 @@ private:
|
||||
Q_SLOT void resetHelper();
|
||||
Q_SLOT void expandNode(const QModelIndex &idx);
|
||||
Q_SLOT void collapseNode(const QModelIndex &idx);
|
||||
Q_SLOT void setUpdatesEnabled(bool enable);
|
||||
|
||||
void setModel(QAbstractItemModel *model);
|
||||
void keyPressEvent(QKeyEvent *ev);
|
||||
|
||||
Reference in New Issue
Block a user