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

Inspector: Do not disable Locals and Expressions

Browse Source 
Inspector follows a different cycle and its contents are
always valid during a debug session. Show the values in
Locals and Expressions as valid for user to interact
with them.

Task-number: QTCREATORBUG-8167

Change-Id: If2f622de5b8bf6da78571bc007efd19602a5f389
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Aurindam Jana
2012-11-08 09:40:56 +01:00
committed by Kai Koehne
parent 28bcc5634c
commit bc5cda03e4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -731,10 +731,10 @@ bool WatchModel::canFetchMore(const QModelIndex &idx) const
{ {
if (!idx.isValid()) if (!idx.isValid())
return false; return false;
if (!contentIsValid())
return false;
WatchItem *item = watchItem(idx); WatchItem *item = watchItem(idx);
QTC_ASSERT(item, return false); QTC_ASSERT(item, return false);
if (!contentIsValid() && !item->isInspect())
return false;
if (!item->iname.contains('.')) if (!item->iname.contains('.'))
return false; return false;
return !m_fetchTriggered.contains(item->iname); return !m_fetchTriggered.contains(item->iname);
@@ -1032,7 +1032,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
static const QVariant red(QColor(200, 0, 0)); static const QVariant red(QColor(200, 0, 0));
static const QVariant gray(QColor(140, 140, 140)); static const QVariant gray(QColor(140, 140, 140));
if (idx.column() == 1) { if (idx.column() == 1) {
if (!data.valueEnabled || !contentIsValid()) if (!data.valueEnabled || (!contentIsValid() && !data.isInspect()))
return gray; return gray;
if (data.value != m_valueCache.value(data.iname)) if (data.value != m_valueCache.value(data.iname))
return red; return red;
@@ -1152,10 +1152,11 @@ bool WatchModel::setData(const QModelIndex &idx, const QVariant &value, int role
Qt::ItemFlags WatchModel::flags(const QModelIndex &idx) const Qt::ItemFlags WatchModel::flags(const QModelIndex &idx) const
{ {
if (!contentIsValid()) if (!idx.isValid())
return Qt::ItemFlags(); return Qt::ItemFlags();
if (!idx.isValid()) const WatchData &data = *watchItem(idx);
if (!contentIsValid() && !data.isInspect())
return Qt::ItemFlags(); return Qt::ItemFlags();
// Enabled, editable, selectable, checkable, and can be used both as the // Enabled, editable, selectable, checkable, and can be used both as the
@@ -1166,7 +1167,6 @@ Qt::ItemFlags WatchModel::flags(const QModelIndex &idx) const
static const Qt::ItemFlags editable = notEditable | Qt::ItemIsEditable; static const Qt::ItemFlags editable = notEditable | Qt::ItemIsEditable;
// Disable editing if debuggee is positively running except for Inspector data // Disable editing if debuggee is positively running except for Inspector data
const WatchData &data = *watchItem(idx);
const bool isRunning = engine() && engine()->state() == InferiorRunOk; const bool isRunning = engine() && engine()->state() == InferiorRunOk;
if (isRunning && engine() && !engine()->hasCapability(AddWatcherWhileRunningCapability) && if (isRunning && engine() && !engine()->hasCapability(AddWatcherWhileRunningCapability) &&
!data.isInspect()) !data.isInspect())