summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-07-06 11:28:30 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-07-06 11:30:46 (GMT)
commit7629184953898416c5ffa302b761e1ee3f65d9ee (patch)
tree425f828cca1fbbfbdca22962383644b85d027303 /src/gui/text
parentebb539d3852658a104e6d59804ea9ad813f9e82d (diff)
downloadQt-7629184953898416c5ffa302b761e1ee3f65d9ee.zip
Qt-7629184953898416c5ffa302b761e1ee3f65d9ee.tar.gz
Qt-7629184953898416c5ffa302b761e1ee3f65d9ee.tar.bz2
Make QScriptAnalysis fit in two bytes again
When the size of the "flags" variable was increased, the bit field was expanded to be three bytes. Since the "script" variable does not use its full eight bits, we reduce it by one to compensate. Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qtextengine_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index 908a0ec..1ec3791 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -128,7 +128,7 @@ struct Q_AUTOTEST_EXPORT QScriptAnalysis
TabOrObject = Tab,
Object = 7
};
- unsigned short script : 8;
+ unsigned short script : 7;
unsigned short bidiLevel : 6; // Unicode Bidi algorithm embedding level (0-61)
unsigned short flags : 3;
inline bool operator == (const QScriptAnalysis &other) const {