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: (31 commits)
  Fixed an on-exit crash for apps using GL.
  QMetaType: do not crash when registering builtin stream operator
  Fix another potential strstr() crash for EGL based GL apps.
  Fixed an on-exit application crash for GL apps using EGL.
  Compile fix.
  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
  ...

0 files changed, 0 insertions, 0 deletions