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, 7 Apr 2011 20:32:18 +0000 (06:32 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Apr 2011 20:32:18 +0000 (06:32 +1000)
commita43c406311e4888b2a1d8a6bbf099041022c7e54
tree564827ae9179d56c95cc0be568affca41d5429d4
parentdea805c0561a1a7f8e93f2f348d13f7cec8e16bb
parent051a76c1d65d698f71dc75c89f91ae9021357eae
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:
  Image w/ PreserveAspectFit has its width changed once more than needed.