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

debugger: do not disable updates on locals and expressions

Browse Source 
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:
hjk
2012-01-19 13:48:45 +01:00
committed by hjk
parent b6a06105c5
commit 8e3b9d38e8
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/watchhandler.cpp
View File

@@ -207,14 +207,14 @@ void WatchModel::beginCycle(bool fullCycle)
if (fullCycle) if (fullCycle)
m_generationCounter++; m_generationCounter++;
emit enableUpdates(false); //emit enableUpdates(false);
} }
void WatchModel::endCycle() void WatchModel::endCycle()
{ {
removeOutdated(); removeOutdated();
m_fetchTriggered.clear(); m_fetchTriggered.clear();
emit enableUpdates(true); //emit enableUpdates(true);
} }
DebuggerEngine *WatchModel::engine() const DebuggerEngine *WatchModel::engine() const

3
src/plugins/debugger/watchhandler.h
View File

@@ -122,9 +122,6 @@ private:
void dumpHelper(WatchItem *item); void dumpHelper(WatchItem *item);
void emitAllChanged(); void emitAllChanged();
signals:
void enableUpdates(bool);
private: private:
QString displayType(const WatchData &typeIn) const; QString displayType(const WatchData &typeIn) const;
QString formattedValue(const WatchData &data) const; QString formattedValue(const WatchData &data) const;

12
src/plugins/debugger/watchwindow.cpp
View File

@@ -997,23 +997,11 @@ void WatchWindow::setModel(QAbstractItemModel *model)
} }
connect(model, SIGNAL(layoutChanged()), SLOT(resetHelper())); 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() void WatchWindow::resetHelper()
{ {
bool old = updatesEnabled();
setUpdatesEnabled(false);
resetHelper(model()->index(0, 0)); resetHelper(model()->index(0, 0));
setUpdatesEnabled(old);
} }
void WatchWindow::resetHelper(const QModelIndex &idx) void WatchWindow::resetHelper(const QModelIndex &idx)

1
src/plugins/debugger/watchwindow.h
View File

@@ -62,7 +62,6 @@ private:
Q_SLOT void resetHelper(); Q_SLOT void resetHelper();
Q_SLOT void expandNode(const QModelIndex &idx); Q_SLOT void expandNode(const QModelIndex &idx);
Q_SLOT void collapseNode(const QModelIndex &idx); Q_SLOT void collapseNode(const QModelIndex &idx);
Q_SLOT void setUpdatesEnabled(bool enable);
void setModel(QAbstractItemModel *model); void setModel(QAbstractItemModel *model);
void keyPressEvent(QKeyEvent *ev); void keyPressEvent(QKeyEvent *ev);