Merge remote-tracking branch 'origin/3.3'

This commit is contained in:
Eike Ziller
2014-11-26 11:11:46 +01:00
39 changed files with 639 additions and 173 deletions

View File

@@ -154,9 +154,13 @@ static QString errorLocation(const QModelIndex &index, const Error &error,
link, linkAttr));
}
QWidget *MemcheckErrorDelegate::createDetailsWidget(const QFont & font, const QModelIndex &errorIndex, QWidget *parent) const
QWidget *MemcheckErrorDelegate::createDetailsWidget(const QFont & font,
const QModelIndex &errorIndex,
QWidget *parent) const
{
QWidget *widget = new QWidget(parent);
QTC_ASSERT(errorIndex.isValid(), return widget);
QVBoxLayout *layout = new QVBoxLayout;
// code + white-space:pre so the padding (see below) works properly
// don't include frameName here as it should wrap if required and pre-line is not supported