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: (23 commits)
  Refactor QDirectFBPixmap::fromImage slightly
  QDirectFBPixmap can handle NoOpaqueDetection.
  Reverts using composition mode when using DeviceCoordinateMode cache.
  Fix linking error
  Fix compile error on Symbian 9.1, caused in network/access.
  QInputContextFactory::languages implementation for Symbian.
  QS60Style cannot draw transparency to UI element border areas
  Changed pkg_prerules to not use default_deployment for vendor ID
  Enable armcc version specific compler options for Symbian
  Fix another off-by-1 error in OpenVG image painting.
  Fix OpenVG build on non-Symbian platforms.
  QNAM HTTP: Symbian compile fix
  tst_qnetworkreply: Fix side effect, add another test
  QNAM HTTP: Fix crazy crash when exiting application
  Correct documentation for ObjectReplacementCharacter and ReplacementCh.
  Prevents a useless repaint with QGraphicsItem cache mode.
  Fix for submenu placement for QMenus in Symbian.
  Symbian event loop priority drop not used in Symbian^4
  QMessageBox is smaller than native MessageBox
  Doc: Fix links in the ActiveQt framework, and also link to the tools.
  ...

0 files changed, 0 insertions, 0 deletions