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: (46 commits)
  Fix crash in indeterminate progressbars on windows
  Fix infinite loop in qmake when reading malformed .ts files.
  Fix timer regression for indeterminate progressbars
  Improve performance of bilinear upscaling of images with neon.
  Fix libinfixed usage in Symbian when def files are used
  Made documentation of QPixmap::createMaskFromColor match behaviour.
  Improve performance of bilinear downscaling of images with neon.
  Document the 'variant' basic type
  Add double type to QML Basic Types docs
  Remove redundant docs
  Doc: Added a missing license header.
  More testing for KeyNavigation attached properties.
  Add tests for ListView.indexAt() and GridView.IndexAt()
  runonphone: Only print the modprobe instructions on linux
  reword: Make the USB serial device enumeration work on OS X, too
  runonphone: Check that the device->config is valid before dereferencing it
  Remove few compile warnings
  Fix using QFileDialog statics in Symbian.
  doc: Replaced some \raw and \endraw uses with \table and \endtable
  doc: Replaced some \raw and \endraw uses with \table and \endtable
  ...

0 files changed, 0 insertions, 0 deletions