Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 17 Jun 2010 05:00:54 +0000 (07:00 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 17 Jun 2010 05:00:54 +0000 (07:00 +0200)
commitefc8b0c9c97a84097bc7f62a109e455caa8b2279
treec2db4a844ba39a96125d4eba2f56b1c51a46badb
parentdc5543f5595870209e8122d13d070694b5e0eb39
parenta6b0458c5ab5bc8ad6c868425820e0bf0e932336
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  doc: add note that items with width or height of 0 are not positioned.
  Add test for model data changes.
  clearFocus() shouldn't mess with focus if it doesn't have focus
  Fix the N900 device orientation backend
  Micro cleanup
  Write TextInput.positionToRectangle docs.
  Minor demo fixes
  Fix autoScroll implementation
  Move knowledge of QGraphicsObject out of qml engine
  Stopping a flick resulted in the next click being consumed.
  Enhance docs
  Slight addition to the docs.