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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (29 commits)
  Compiler warning in QAbstractSlider.
  Optimize QPathClipper::pathToRect.
  QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.
  QStyleSheetStyle: Fix combinaison of border-image and border-radius
  Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar"
  Proper Fav icon is not shown, for all the links default fav icon shown
  Update changes-4.6.2.
  Make DSFLIP_ONSYNC part of the default flip flags.
  Fixed a failure in tst_qgl.
  4.6.2 changes
  Avoids a possible crash when saving the state of a main window
  Implemented QGifHandler::imageCount().
  Fixed compilation of the GL2 engine for OpenGL ES 2.
  fix whitespace
  Document that QModelIndex::child does not work for the root item
  Fixed missing textures in the boxes demo.
  Fix QTBUG_7714_fullUpdateDiscardingOpacityUpdate2 autotest in qws-linux
  Assert failure when setting a widget focus proxy as its successor in tab order
  Fixed garbled 3D Qt logo in the overpainting example.
  fix crash in Phonon::DS9 backend
  ...

0 files changed, 0 insertions, 0 deletions