Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (61 commits)
  QTcpSocket: Fix for disconnect in Unbuffered mode.
  QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.
  Added automatic graphicssystem switching on meego when app is minimized.
  Disabled non-QDeclarativeItems in Flickable break flicking
  Hot fix for compilation without QGL_USE_TEXTURE_POOL
  Initial implementation of GLES2.0 resource pooling
  Designer: Fix a bug affecting tab reordering of promoted tab widgets.
  Designer: Fix a bug clearing the Z-Order when adding a new widget.
  Adjust right bearing when breaking with line separators
  Fix the license info for bin/elf2e32_qtwrapper.pl.
  Avoid panics in QDesktopWidget on Symbian emulator.
  QS60Style: use placeholder texture when polishing widgets and palette
  Regression: QS60Style: Theme background is incorrect
  Remove changes from fix to QTBUG-17045 that were not related to the fix
  Prevent null pointer crash when closing splitview
  Border still drawn on Rectangle elements when border.width == 0
  Regression: currentIndex was not set correctly after model cleared.
  Remove bindings before assigning constants in VME
  QNAM HTTP: error() in case connection is closed unexpectedly
  Prevented infinite recursion in QPainterPath::contains().
  ...

0 files changed, 0 insertions, 0 deletions