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)
  Merge faba550d704312a29d9485bcaaa506331f102301 from 4.7 to master.
  Minor OpenVG optimization when setting the EGL surface attribute.
  Make sure the QS60PaintEngine can draw other classes of pixmap data
  Fix failure on Windows after commit ccd3f66
  tst_qtcpserver: Another attempt to reproduce QTBUG-14268
  Fix crash when constructing QThreadStorage after global destructors have run
  tst_qtcpsocket: Attempt to reproduce QTBUG-14268
  Fixed a buffer overrun when pasting large data from non-Qt apps
  Fix copying large data to non-Qt applications
  fix regexp in "make custom command handling in vc(x)proj files sane"
  Define QVG_SCISSOR_CLIP for QtOpenVG on Symbian.
  Remove unused/incorrect TFX commands pertaining to layers on Symbian.
  QS60Style: Highlighted TreeBranch indicator is incorrect
  qmake: Include -pthread when reducing duplicate library arguments
  qmake: Ensure right library order when reducing duplicate libraries
  rebuild configure.exe
  make QMAKE_POST_LINK handling in nmake generator sane
  make custom command handling in vc(x)proj files sane
  Revert "QWorkspace: fix hardcoded min size overwriting the real min size"
  Adding a threshold for partial updates.
  ...

0 files changed, 0 insertions, 0 deletions