diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-11-07 09:03:08 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-11-07 10:45:11 +0100 |
| commit | a927fcd4ac948b3439518d1b92a717e8d7e95fed (patch) | |
| tree | 7ce21cf386f9a9ad501223ac0de10903c207d9f0 /src/quick/items/qquicktextnodeengine.cpp | |
| parent | 1bcf85bd38684ef4d993c56264a95b965ed936c7 (diff) | |
Fix missing paragraph containing object replacement char
If a user manually adds an object replacement char, it will not
have a corresponding object, but we would still skip the paragraph
in this case, causing the text to disappear.
[ChangeLog][Text] Fixed an issue where a paragraph containing the
Object Replacement Character (U+FFFC) would be invisible.
Pick-to: 6.5 6.6
Fixes: QTBUG-78441
Change-Id: I04a20b8287895bbed5d1f22f1a449d6dbd9d448b
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'src/quick/items/qquicktextnodeengine.cpp')
| -rw-r--r-- | src/quick/items/qquicktextnodeengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp index 5d771f7ace..cc69c96720 100644 --- a/src/quick/items/qquicktextnodeengine.cpp +++ b/src/quick/items/qquicktextnodeengine.cpp @@ -1068,7 +1068,7 @@ void QQuickTextNodeEngine::addTextBlock(QTextDocument *textDocument, const QText else setPosition(blockBoundingRect.topLeft()); - if (text.contains(QChar::ObjectReplacementCharacter)) { + if (text.contains(QChar::ObjectReplacementCharacter) && charFormat.objectType() != QTextFormat::NoObject) { QTextFrame *frame = qobject_cast<QTextFrame *>(textDocument->objectForFormat(charFormat)); if (!frame || frame->frameFormat().position() == QTextFrameFormat::InFlow) { int blockRelativePosition = textPos - block.position(); |