Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 1 Mar 2010 07:56:38 +0000 (08:56 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 1 Mar 2010 07:56:38 +0000 (08:56 +0100)
commit236c3ad7bacf165069b834b62fede6b147cfaf03
treeb33ce32ee9b86c4c6bf2e87cfd1c6d6f61bf2e2c
parentd65cb666cba22f08dd72d8e3336b104713e9daca
parent049330b4a54836f227a0e179082527a5272e868d
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
  Keep image centered in ImageDetails.
  Small optimizations.
  Fix position of image in detail view in flickr-mobile
  Make compile following QDeclarativePropertyChanges.
  Fix reload() when keys are not specified, and add extra tests.