diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index baff79973f2..452f814231c 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -2216,17 +2216,15 @@ void QTextDocumentLayoutPrivate::drawListItem(const QPointF &offset, QPainter *p } case QTextListFormat::ListSquare: if (!marker) - painter->fillRect(r, brush); + painter->fillRect(r, painter->pen().brush()); break; case QTextListFormat::ListCircle: - if (!marker) { - painter->setPen(QPen(brush, 0)); + if (!marker) painter->drawEllipse(r.translated(0.5, 0.5)); // pixel align for sharper rendering - } break; case QTextListFormat::ListDisc: if (!marker) { - painter->setBrush(brush); + painter->setBrush(painter->pen().brush()); painter->setPen(Qt::NoPen); painter->drawEllipse(r); } diff --git a/tests/baseline/text/data/colored_list.html b/tests/baseline/text/data/colored_list.html new file mode 100644 index 00000000000..d1cca94460f --- /dev/null +++ b/tests/baseline/text/data/colored_list.html @@ -0,0 +1,68 @@ + + + + + + + + + + + + + +
    +
  1. decimal
    2. +
  2. bronze decimal
    3. +
  3. red number, pink text
    4. +
+ +
    +
  1. uppercase
    2. +
  2. bronze uppercase
    3. +
  3. red letter, pink text
    4. +
+ +
    +
  1. lowercase
    2. +
  2. bronze lowercase
    3. +
  3. red letter, pink text
    4. +
+ +
    +
  1. lower roman
    2. +
  2. bronze roman
    3. +
  3. red number, pink text
    4. +
+ +
    +
  1. upper roman
    2. +
  2. bronze roman
    3. +
  3. red number, pink text
    4. +
+ +