diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2022-09-23 10:31:32 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2022-09-23 20:08:56 +0200 |
| commit | ce4c26c8d16fbc9fdafd8325b8a0b32bacd8cd93 (patch) | |
| tree | 167f059436514772d8aa1f3cef389cdfb4b9837a /src/gui/text/qtextengine_p.h | |
| parent | 9516823fce1d6f9bb7446fba8192396453af1557 (diff) | |
Revert "QTextLayout: fix maximumWidth() for a text containing line separator"
This reverts commit 013c346a8dcbd618febb07884c64c740daf9754d. It was
determined to cause a regression in Qt Quick: QTBUG-106899.
In order to unblock integrations, we need to revert the change. It
can be re-committed later when the problem has been analyzed and
addressed.
Pick-to: 6.2 6.4
Fixes: QTBUG-106899
Task-number: QTBUG-89557
Task-number: QTBUG-104986
Change-Id: I04054587f68ab39fdb038b02fc69ebfa3dc7d197
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
| -rw-r--r-- | src/gui/text/qtextengine_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index c207ab63ae..c653bfc92f 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -385,7 +385,6 @@ public: uint layoutState : 2; uint memory_on_stack : 1; uint haveCharAttributes : 1; - uint previousLineManuallyWrapped : 1; QString string; bool reallocate(int totalGlyphs); }; |