summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextengine_p.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-07-06 23:56:21 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-07-06 23:56:21 (GMT)
commitab5ddda87e66e2f286ec28707ca9d1e0df94d4d8 (patch)
tree551a31ae7d5bba5f860e0d57eea02022e384b701 /src/gui/text/qtextengine_p.h
parent32d6c5adb9d75ad7e3b2cef818f6b17d77d0f929 (diff)
downloadQt-ab5ddda87e66e2f286ec28707ca9d1e0df94d4d8.zip
Qt-ab5ddda87e66e2f286ec28707ca9d1e0df94d4d8.tar.gz
Qt-ab5ddda87e66e2f286ec28707ca9d1e0df94d4d8.tar.bz2
Make the QScriptLine bit field fit in 4 bytes again.
When "leadingIncluded" was introduced, "length" was mistakenly not decremented. This commit also changes a bool in QTextEngine::LayoutData to make it part of a 1 byte bit field. Reviewed-by: Eskil Abrahamsen Blomfeldt
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
-rw-r--r--src/gui/text/qtextengine_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index 908a0ec..5588cbc 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -385,7 +385,7 @@ struct Q_AUTOTEST_EXPORT QScriptLine
QFixed textWidth;
QFixed textAdvance;
int from;
- signed int length : 29;
+ signed int length : 28;
mutable uint justified : 1;
mutable uint gridfitted : 1;
uint hasTrailingSpaces : 1;
@@ -430,7 +430,7 @@ public:
uint hasBidi : 1;
uint inLayout : 1;
uint memory_on_stack : 1;
- bool haveCharAttributes;
+ uint haveCharAttributes : 1;
QString string;
void reallocate(int totalGlyphs);
};