diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-11-22 14:37:54 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-11-26 07:36:43 +0100 |
commit | 9a090875c0dc08b4e49464fadd6e8e47ae2cd56c (patch) | |
tree | 7e243d83263c8be742cce3a63f7a61e1c5be45ab /src/gui/text/qtextdocumentlayout.cpp | |
parent | 6493b93b483d65862a22a480b3e72f2967c22f32 (diff) | |
download | qtbase-9a090875c0dc08b4e49464fadd6e8e47ae2cd56c.tar.gz |
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 <nils.jeisecke@saltation.com>
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Diffstat (limited to 'src/gui/text/qtextdocumentlayout.cpp')
-rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |