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

debugger: fix recent regression of non-persistent expanded watch items

Browse Source 
Change-Id: Iec8b37812faca5584d268712181ffeca98ef6e8a
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-01-19 15:19:28 +01:00
committed by hjk
parent c06727ca17
commit fa26b986de
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -673,6 +673,14 @@ void WatchModel::emitDataChanged(int column, const QModelIndex &parentIndex)
emitDataChanged(column, index(i, 0, parentIndex)); emitDataChanged(column, index(i, 0, parentIndex));
} }
void WatchModel::invalidateAll(const QModelIndex &parentIndex)
{
QModelIndex idx1 = index(0, 0, parentIndex);
QModelIndex idx2 = index(rowCount(parentIndex) - 1, columnCount(parentIndex) - 1, parentIndex);
if (idx1.isValid() && idx2.isValid())
emit dataChanged(idx1, idx2);
}
// Truncate value for item view, maintaining quotes. // Truncate value for item view, maintaining quotes.
static QString truncateValue(QString v) static QString truncateValue(QString v)
{ {
@@ -1878,10 +1886,10 @@ void WatchHandler::resetLocation()
{ {
if (m_resetLocationScheduled) { if (m_resetLocationScheduled) {
m_resetLocationScheduled = false; m_resetLocationScheduled = false;
m_return->reset(); m_return->invalidateAll();
m_locals->reset(); m_locals->invalidateAll();
m_watchers->reset(); m_watchers->invalidateAll();
m_tooltips->reset(); m_tooltips->invalidateAll();
} }
} }

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

@@ -90,6 +90,8 @@ private:
bool canFetchMore(const QModelIndex &parent) const; bool canFetchMore(const QModelIndex &parent) const;
void fetchMore(const QModelIndex &parent); void fetchMore(const QModelIndex &parent);
void invalidateAll(const QModelIndex &parentIndex = QModelIndex());
friend class WatchHandler; friend class WatchHandler;
WatchItem *watchItem(const QModelIndex &) const; WatchItem *watchItem(const QModelIndex &) const;