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: (64 commits)
  Setting TextInput.cursorPosition outside bounds crashed.
  Update test bitmaps for QDeclarativeImage::svg() autotest on Windows
  Don't truncate image:// url strings prematurely
  Update docs on importing javascript files
  Fix deployment of minehunt for Symbian
  Quiet unused parameter warnings.
  Use relative include instead of absolute in default qmake.conf
  Fix waitForOpened not working with already active configuration
  Fix incorrect file name case for OpenGL libraries in symbian.conf.
  Fix QDeclarativeState::reset() autotest
  Update test bitmaps for QDeclarativeImage::svg() autotest on Linux
  Doc: typo fixed in doc/src/declarative/extending.qdoc
  Improved orientation change autotest
  Avoid duplicate resize event
  Add work around for bug when painting w/glTexSubImage into large texture
  QmlDebugger: Fix runtime warnings about unregistered metatypes
  Suppress a warning about killing a timer that isn't active.
  ICC: Don't print warning 1259 since it's too annoying.
  Autotest: Add some comments about this obscure test.
  Add a warning about trying to release a timer ID that isn't active
  ...

0 files changed, 0 insertions, 0 deletions