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

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (105 commits)
  Testlib XML flush: use benchmarkMetricName (identifier) overall instead of benchmarkMetricUnit (human text)
  Update the testlib XML baselines with the unit names from QTestLib
  Renaming a few unexported, private symbols
  tst_selftest: parse benchlib results in XML format too
  tst_selftests: replace a line number with __LINE__ in XML too
  Removed fullscreen responsiveness of softkeys
  tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt version.
  fix crash in QXmlStreamReader
  Fixed a QFontEngine leak for QFont objects used in threads.
  The cmd line arguments have not been delegated properly.
  Apply Rhys's fix to qpaintengine_vg.cpp to make it compile
  Fixed QGLWidget::grabFrameBuffer() to honor the 'withAlpha' value.
  Adjusted layout of audiodevice example to use scrollbar.
  win32 backend for low-level audio fixes
  QXmlSchema internals: fix crash with anonymous types
  QNAM HTTP: Fix invoking a method when being destructed right now (2)
  QNAM: Use a reference in appendDownstreamData
  QNAM HTTP: Divide QNetworkReplyImplPrivate::appendDownstreamData
  QNAM HTTP: Avoid one copy
  Re-apply change 5107946e97cbc480a9329565c29b7384c8ba0860 by Iain
  ...

0 files changed, 0 insertions, 0 deletions