From 6287977849ff5cab64a944fb0590d306a79f3637 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 5 Jun 2010 21:15:56 +0200
Subject: The default text direction for QTextOption is Qt::LayoutDirectionAuto

The change is binary compatible, even though the changed bitfield is
being accessed inline. The reason is that we extend by a bit that
has previously been initialized to 0. bitordering will ensure that old
code reads Qt::LayoutAuto as Qt::LeftToRight.

Task-number: Part of QT-3292
Reviewed-by: Simon Hausmann
---
 src/gui/text/qtextoption.cpp | 2 +-
 src/gui/text/qtextoption.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp
index c1e254c..3b02ebe 100644
--- a/src/gui/text/qtextoption.cpp
+++ b/src/gui/text/qtextoption.cpp
@@ -65,7 +65,7 @@ QTextOption::QTextOption()
       tab(-1),
       d(0)
 {
-    direction = QApplication::layoutDirection();
+    direction = Qt::LayoutDirectionAuto;
 }
 
 /*!
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h
index 1381ed1..fa8c6f2 100644
--- a/src/gui/text/qtextoption.h
+++ b/src/gui/text/qtextoption.h
@@ -134,8 +134,8 @@ private:
     uint align : 8;
     uint wordWrap : 4;
     uint design : 1;
-    uint direction : 1;
-    uint unused : 19;
+    uint direction : 2;
+    uint unused : 18;
     uint f;
     qreal tab;
     QTextOptionPrivate *d;
-- 
cgit v0.12