forked from qt-creator/qt-creator
debugger: fix 2.x regression: allow assignment to structure members
This commit is contained in:
@@ -602,8 +602,21 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case ExpressionRole:
|
case ExpressionRole: {
|
||||||
return data.exp;
|
if (!data.exp.isEmpty())
|
||||||
|
return data.exp;
|
||||||
|
if (!data.addr.isEmpty() && !data.type.isEmpty()) {
|
||||||
|
bool ok;
|
||||||
|
const quint64 addr = data.addr.toULongLong(&ok, 16);
|
||||||
|
if (ok && addr)
|
||||||
|
return QString("*(%1*)%2").arg(data.type).arg(addr);
|
||||||
|
}
|
||||||
|
WatchItem *parent = item->parent;
|
||||||
|
if (parent && !parent->exp.isEmpty())
|
||||||
|
return QString("(%1).%2")
|
||||||
|
.arg(QString::fromLatin1(parent->exp)).arg(data.name);
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
|
||||||
case INameRole:
|
case INameRole:
|
||||||
return data.iname;
|
return data.iname;
|
||||||
|
Reference in New Issue
Block a user