Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
  QWidget::childAt for masked child widgets doesn't work properly
  Optimized 90-, 180-, and 270- rotated blits in raster paint engine.
  Rename QLocale::isWrittenRightToLeft() to textDirection()
  Fixed some bugs in detection of keyboard directionality
  Add a isWrittenRightToLeft() method to QLocale.
  consistent handling of directionality in QTextLayout
  For an empty line edit the cursor position is depending on input language
  correctly initialize the bidi level in the text engine
  Use the textDirection() of blocks correctly.
  Add QTextBlock::textDirection()
  Make sure LayoutDirectionAuto is the default text direction
  LayoutDirectionAuto is the default layout direction for QPainter
  Correct BiDi behavior of QLineEdit
  The default text direction for QTextOption is Qt::LayoutDirectionAuto
  Handle setting the layoutDirection to Qt::LayoutDirectionAuto
  Introduce LayoutDirection Qt::LayoutDirectionAuto
  Fix QString::isRightToLeft() to conform with Unicode Bidi algorithm
  small optimisation
  QVarLenghtArray: Add typedefs for stl compatibility.
  prefer QElapsedTimer over QTime
  ...

1 files changed, 2 insertions, 2 deletions

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;