From 4fd9ee945b281d55569222000ae6a7e33f2d84cc Mon Sep 17 00:00:00 2001
From: Zhang xianting <[email protected]>
Date: Mon, 10 Jan 2022 18:16:31 +0800
Subject: [PATCH] qt5-qtbase fix bug108222 linewrap and carriage_return get different rowspacing.

---
 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 bed0a2c4..7291eca2 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -2546,7 +2546,7 @@ void QTextDocumentLayoutPrivate::layoutFlow(QTextFrame::Iterator it, QTextLayout
 static inline void getLineHeightParams(const QTextBlockFormat &blockFormat, const QTextLine &line, qreal scaling,
                                        QFixed *lineAdjustment, QFixed *lineBreakHeight, QFixed *lineHeight, QFixed *lineBottom)
 {
-    qreal rawHeight = qCeil(line.ascent() + line.descent() + line.leading());
+    qreal rawHeight = qCeil(line.ascent() + line.descent());
     *lineHeight = QFixed::fromReal(blockFormat.lineHeight(rawHeight, scaling));
     *lineBottom = QFixed::fromReal(blockFormat.lineHeight(line.height(), scaling));
 
-- 
2.27.0