From 9a090875c0dc08b4e49464fadd6e8e47ae2cd56c Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 22 Nov 2020 14:37:54 +0100 Subject: QTextDocument: allow css border-style of table collapsed cell borders 8664ee610d3d8bb8a2a578a6aa6bfd38afe4fcda added support for collapsed borders but set the style to solid no matter what border-style defined. Fix it by properly setting the desired border style. Task-number: QTBUG-36152 Change-Id: Ie527511f831e7f62ab7064d4958b35ddbf1a9403 Pick-to: 5.12 Reviewed-by: Nils Jeisecke Reviewed-by: Samuel Gaist --- src/gui/text/qtextdocumentlayout.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/text') diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 7a46ae4ce9..3138168e90 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -1616,7 +1616,7 @@ void drawCellBorder(const QTextDocumentLayoutPrivate *p, QPainter *painter, QBrush brush; if (edgeData.edgeClass != EdgeData::ClassExplicit && td->drawGrid) { - borderStyle = QTextFrameFormat::BorderStyle_Solid; + borderStyle = table->format().borderStyle(); brush = table->format().borderBrush(); } else { -- cgit v1.2.3