Merge branch 'master' into develop

This commit is contained in:
Michael Mandl 2019-02-08 21:04:19 +01:00
commit f0fe217894
2 changed files with 3 additions and 3 deletions

View file

@ -80,7 +80,7 @@ void PrintableModel::drawNumberSquare(QPainter &painter, double x, double y, int
void PrintableModel::PrintableModel::drawCheckSquare(QPainter &painter, const QRectF &cell,
bool checked)
{
drawTextSquare(painter, cell, checked ? "\u2612" : "\u2610");
drawTextSquare(painter, cell, checked ? u8"\u2612" : u8"\u2610");
}
void PrintableModel::drawResultSquare(QPainter &painter, double y, bool rightCell,

View file

@ -229,13 +229,13 @@ void ResultModel::printTo(QPainter &painter) const
PrintableModel::drawTextSquare(painter, {x, y + 0 * rowHeight, cellWidth, rowHeight}, "");
PrintableModel::drawTextSquare(painter, {x, y + 1 * rowHeight, cellWidth, rowHeight},
"\u2265 PR 84");
u8"\u2265 PR 84");
PrintableModel::drawTextSquare(painter, {x, y + 2 * rowHeight, cellWidth, rowHeight},
"< PR 84");
PrintableModel::drawGreySquare(painter, {x, y + 3 * rowHeight, cellWidth, rowHeight});
PrintableModel::drawTextSquare(painter, {x, y + 3 * rowHeight, cellWidth, rowHeight},
"\u2264 PR 16");
u8"\u2264 PR 16");
x += cellWidth;
for (const auto &result : m_results)