forked from qt-creator/qt-creator
Qt6: Various include, QPrinter, and QFlags adaptations
Task-number: QTCREATORBUG-24098 Change-Id: I7aca7d25a063c84d6eec14c2c5789357ce56a7b3 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -817,7 +817,7 @@ QVariant MacrosModel::data(const QModelIndex &index, int role) const
|
||||
else if (column == MacroColumn)
|
||||
return macro.toString();
|
||||
} else if (role == Qt::TextAlignmentRole) {
|
||||
return Qt::AlignTop + Qt::AlignLeft;
|
||||
return QVariant::fromValue(Qt::AlignTop | Qt::AlignLeft);
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
@@ -1067,7 +1067,7 @@ QVariant TokensModel::data(const QModelIndex &index, int role) const
|
||||
else if (column == NewlineColumn)
|
||||
return CMI::Utils::toString(token.newline());
|
||||
} else if (role == Qt::TextAlignmentRole) {
|
||||
return Qt::AlignTop + Qt::AlignLeft;
|
||||
return QVariant::fromValue(Qt::AlignTop | Qt::AlignLeft);
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user