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:
  Compile on Symbian - rework the X11 mask patch a bit.
  Fix text direction setting in QTextBlock layout
  Fix text direction handling in QLabel
  Fixed QPixmap::resize() for X11 pixmap with masks.
  QPainter not restored correctly in Graphics View.
  Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape
  Fix compilation
  Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.
  Fix warning on MSVC
  QThread: make sure start works even if called after exit
  Revert "Fixed painter path drawing on FBO without stencil buffer."
  Fix a crash with D&d on mingw
  Revert "Keep other text format with QTextOption::SuppressColors tag on"
  Fixed stencil buffer on FBOs with OpenGL ES.
  Keep other text format with QTextOption::SuppressColors tag on
  QTreeView: do not scroll to top if last item is removed

0 files changed, 0 insertions, 0 deletions