diff options
| author | Eike Ziller <[email protected]> | 2012-11-16 15:31:02 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2012-11-16 15:31:02 +0100 |
| commit | 3e7d94c3626c6904320018d2eedb1407925ed3d5 (patch) | |
| tree | 57479823338e07de3c3ce41bdda46abf58f4ac57 /src/plugins/debugger/watchhandler.cpp | |
| parent | 51bca851174c347edcc6b148ee3a67d70e5fa9eb (diff) | |
| parent | 5981b1e5509395bc0eb0ff7071e63a529b31fb11 (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
Diffstat (limited to 'src/plugins/debugger/watchhandler.cpp')
| -rw-r--r-- | src/plugins/debugger/watchhandler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 00a44735b77..791336ee25c 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -731,10 +731,10 @@ bool WatchModel::canFetchMore(const QModelIndex &idx) const { if (!idx.isValid()) return false; - if (!contentIsValid()) - return false; WatchItem *item = watchItem(idx); QTC_ASSERT(item, return false); + if (!contentIsValid() && !item->isInspect()) + return false; if (!item->iname.contains('.')) return false; 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 gray(QColor(140, 140, 140)); if (idx.column() == 1) { - if (!data.valueEnabled || !contentIsValid()) + if (!data.valueEnabled || (!contentIsValid() && !data.isInspect())) return gray; if (data.value != m_valueCache.value(data.iname)) 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 { - if (!contentIsValid()) + if (!idx.isValid()) return Qt::ItemFlags(); - if (!idx.isValid()) + const WatchData &data = *watchItem(idx); + if (!contentIsValid() && !data.isInspect()) return Qt::ItemFlags(); // 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; // Disable editing if debuggee is positively running except for Inspector data - const WatchData &data = *watchItem(idx); const bool isRunning = engine() && engine()->state() == InferiorRunOk; if (isRunning && engine() && !engine()->hasCapability(AddWatcherWhileRunningCapability) && !data.isInspect()) |