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: (377 commits)
  Correct last right bearing in boundingBox(glyphs)
  Make sure propagated font in QGraphicsWidget can be set on a QPainter
  Apparently QPen::brush() can't return a NoBrush for a NoPen.
  Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
  Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
  use QFile:map instead of ::mmap
  Do not use global static const references to objects
  Revert "Refactor blend_transformed_bilinear to simplify the blend type checking"
  Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.
  Refactor blend_transformed_bilinear to simplify the blend type checking
  Note RTL behavior changes in docs and changelog
  Implement qt_memfill32 with Neon.
  Implement the composition mode Plus with Neon.
  Fix the broken unicode detection of ODBC driver.
  Doc: Fixed qdoc warnings.
  Doc: updating getting started docs - not finished
  Make it possible again to build Qt without webkit
  Doc: fixing creator bugs, removing menus and textbox in the header
  Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
  Doc: Fixing overlapping text in header list
  ...

0 files changed, 0 insertions, 0 deletions