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: (27 commits)
  Fixed ARM .def files.
  Doc: QSettings::sync() imports changes made by other processes.
  Made -graphicssystem trace work with Qt::TextBypassShaping flag.
  Fix an assertion in comp_func_SourceOver_sse2() if const_alpha == 0
  Add a manual test for regular widget interaction with the table.
  New variant of ::createPixmapData with origin for QGraphicsSystem.
  EGL plane levels are the same as all other GL backends.
  Need to access extensionFuncs in subclasses too.
  Export QGLWindowSurface too.
  Export the QGLPixmapData so that we can override it in a custom graphics system.
  Fixed autotest failure in QPathClipper on N900.
  Fixed autotest failure in QPainter::setOpacity when NEON is used.
  Fix compilation when configured with -no-xrender
  Add a new (internal) flag QGraphicsItem::ItemStopsClickFocusPropagation.
  Fixed some potential index-out-of-bounds issues in QImage.
  Fixed autotest failure in fillRect_stretchToDeviceMode
  Adding a known issue for VC2010 64 bit
  Added a note to desupport VC2010 64-bit
  Normalize integers when calling glVertexAttribPointer()
  Add an implementation of comp_func_solid_SourceOver_neon() with Neon.
  ...

0 files changed, 0 insertions, 0 deletions