summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-10-04 06:52:13 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-10 13:26:13 +0200
commitf0ee31dc93813808a59a0fe576da120de2caf074 (patch)
tree4894feb2cdf725f4bf31b7c04b91e213ed08e217 /src/3rdparty
parent008e5ba61a68846ad29c65a2fe10b8c19c74f6eb (diff)
QTextBoundaryFinder: Introduce BoundaryReason::MandatoryBreak flag
that will be returned by boundaryReasons() when the boundary finder is at the line end position (CR, LF, NewLine Function, End of Text, etc.). The MandatoryBreak flag, if set, means the text should be wrapped at a given position. Change-Id: I32d4f570935d2e015bfc5f18915396a15f009fde Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-shaper.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
index 5a3329dd4b..e2891d047e 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
@@ -135,7 +135,7 @@ typedef struct {
hb_bitfield whiteSpace : 1; /* A unicode whitespace character */
hb_bitfield wordStart : 1;
hb_bitfield wordEnd : 1;
- hb_bitfield unused : 1;
+ hb_bitfield mandatoryBreak : 1;
} HB_CharAttributes;
void HB_GetTailoredCharAttributes(const HB_UChar16 *string, hb_uint32 stringLength,