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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Change-Id: Idf151b6cfe87957cf905e67aab6b1275b9f0506a
This commit is contained in:
Eike Ziller
2023-03-06 08:24:18 +01:00
parent ae86a6a4bc 5ea655cabd
commit 36d9341397
21 changed files with 1083 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1440,15 +1440,15 @@ int WatchModel::memberVariableRecursion(WatchItem *item,
const QString nameRoot = name.isEmpty() ? name : name + '.';
for (int r = 0; r < rows; r++) {
WatchItem *child = item->childAt(r);
const quint64 childAddress = item->address;
const quint64 childAddress = child->address;
if (childAddress && childAddress >= start
&& (childAddress + item->size) <= end) { // Non-static, within area?
&& (childAddress + child->size) <= end) { // Non-static, within area?
const QString childName = nameRoot + child->name;
const quint64 childOffset = childAddress - start;
const QString toolTip = variableToolTip(childName, item->type, childOffset);
const QString toolTip = variableToolTip(childName, child->type, childOffset);
const ColorNumberToolTip colorNumberNamePair((*colorNumberIn)++, toolTip);
const ColorNumberToolTips::iterator begin = cnmv->begin() + childOffset;
std::fill(begin, begin + item->size, colorNumberNamePair);
std::fill(begin, begin + child->size, colorNumberNamePair);
childCount++;
childCount += memberVariableRecursion(child, childName, start, end, colorNumberIn, cnmv);
}