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

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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (1115 commits)
  DeclarativeObserver: Removed the SubcomponentEditorTool
  QDeclarativeDebug: Fix autotest on Windows/MSVC
  Fixed compilation.
  QLibrary: support .so file extension on AIX.
  Fixed compile of qdrawhelper_neon.cpp.
  Update qhostinfo autotest to expect RFC5952 formatted ipv6 addresses
  Fix rendering of Mac controls onto a QImage
  Symbian socket: Implement systemProxyForQuery for service networks
  Increased EPOCHEAPSIZE for qpainter benchmark
  Increased EPOCHEAPSIZE for few benchmarks
  tst_q3dns: update test to follow RFC-5952.
  Re-apply licenseheader text in source files for qt4.7
  Update Symbian DEF-files
  Re-apply licenseheader text in source files for qt4.8
  Updating file with CRLF line endings for the updated header
  Updating file with CRLF line endings for the updated header
  Revert all QScroller and QFlickGesture related code.
  Improve DEFINES crossplatform compatibility in Symbian builds.
  Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range
  Fix crashes with regular expressions QtScript on ARM traditional architectures
  ...