Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  QLabel wraps text at fixed lengths
  Prevent out-of-bounds memory access in drawhelper.
  Check Qt::WA_TranslucentBackground instead of custom widget property.
  New translucency API for the meego graphics system.
  Support for 'qglTranslucent' in QGLWindowSurface.
  Use a different dither distribution matrix + a bit of rand.
  Fixed cubic bezier rendering bug in qgrayraster.
  Revert "qgrayraster: Speed up rendering of small cubic splines."
  Update .def files after 783a278f243c6411f5f32d11f2165b9eed9b6f8c
  Fix QWingedEdge memory usage issue
  Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface already created.
  Proxy mode was not correctly checked.
  Don't emit activeFocusChanged() unless the active focus actually changed
  Prevent always deep-copying in QPixmap::toImage() for raster pixmaps.
  Fix text disappearing on GL when RGB-path is taken (no transformation)
  Fix for GCC on Windows x64.
  Fixed a BC break between S60 SDK 3.2 and 5.0.
  Fix crash in QTextDocument::markContentsDirty
  Make sure to do a deep copy of a QImage when it's being painted on.

0 files changed, 0 insertions, 0 deletions