Merge remote-tracking branch 'origin/4.10' into 4.11

Change-Id: I9b53d00dbc79d52e52f6e18761e6a6c6faec6c84
This commit is contained in:
Eike Ziller
2019-10-08 15:21:12 +02:00
2 changed files with 10 additions and 4 deletions

View File

@@ -899,9 +899,9 @@ static QColor valueColor(const WatchItem *item, int column)
color = Theme::Debugger_WatchItem_ValueInvalid;
else if (!model->m_contentsValid && !item->isInspect())
color = Theme::Debugger_WatchItem_ValueInvalid;
else if (column == 1 && item->value.isEmpty()) // This might still show 0x...
else if (item->value.isEmpty()) // This might still show 0x...
color = Theme::Debugger_WatchItem_ValueInvalid;
else if (column == 1 && item->value != model->m_valueCache.value(item->iname))
else if (item->value != model->m_valueCache.value(item->iname))
color = Theme::Debugger_WatchItem_ValueChanged;
}
}