Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (30 commits)
  Revert "Split Symbian bearer plugin into three platform specfic plugins"
  Don't poll non-polling engines when configurations are in use.
  Doc: updating images
  Fix a corner case where a gesture sometimes doesn't start.
  write PO files without duplicated message ids
  my changes
  Fix failing bypassShaping autotest on the Mac OS X
  More Pixmap cache key optimizations
  QNAM: Improve child deletion order
  QSslCertificate: support large serial numbers
  Split Symbian bearer plugin into three platform specfic plugins
  Doc: adding offline docs to assistant and Qt Creator. Improving small docs and adding highlighting
  Some optimizations for QImage::load()
  fix setRawData()
  Fix QML crashes on the N900
  doc: Added DITA XML generator
  Fix build failure on Symbian 3.1.
  Add the Qt::TextBypassShaping flag.
  QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.
  Add my 4.7.0 changes
  ...

0 files changed, 0 insertions, 0 deletions