From ab5ddda87e66e2f286ec28707ca9d1e0df94d4d8 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 7 Jul 2010 09:56:21 +1000
Subject: 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
---
 src/gui/text/qtextengine_p.h | 4 ++--
 1 file 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);
     };
-- 
cgit v0.12