richtext formatting of numbered and bullet lists (<ol> and <ul>)

Set the text color before drawing bullet points for numbered and bullet
point list, instead of using the color of the previous block.

It seems all other calls to addUnselectedGlyphs() are preceded by some
code to set the current color, so do it also for the bullet points.

Extend the manual test for syntaxhighlighter to add the reproducer.

Fixes: QTBUG-111337
Fixes: QTBUG-123855
Fixes: QTBUG-63741
Task-number: QTBUG-57833
Task-number: QTBUG-26612
Task-number: QTBUG-73859
Change-Id: I51a75152416e07c7f84f99b49e2a4b6ca72e78e9
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp
index 1e437a126d..fd33fa86e2 100644
--- a/src/quick/items/qquicktextnodeengine.cpp
+++ b/src/quick/items/qquicktextnodeengine.cpp
@@ -1035,6 +1035,12 @@ void QQuickTextNodeEngine::addTextBlock(QTextDocument *textDocument, const QText
             line.setPosition(QPointF(0, 0));
             layout.endLayout();
 
+            // set the color for the bullets, instead of using the previous QTextBlock's color.
+            if (charFormat.foreground().style() == Qt::NoBrush)
+                setTextColor(textColor);
+            else
+                setTextColor(charFormat.foreground().color());
+
             QList<QGlyphRun> glyphRuns = layout.glyphRuns();
             for (int i=0; i<glyphRuns.size(); ++i)
                 addUnselectedGlyphs(glyphRuns.at(i));