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>
Wed, 13 Apr 2011 21:46:22 +0000 (07:46 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 13 Apr 2011 21:46:22 +0000 (07:46 +1000)
commit5d2d21377bfb99ddb69a27a05b7baab93d411f35
tree1be0af8f72bb5989c94345e6bd420dd82443c869
parent9bf12a037f96d85cef049305660a1ebd382c9c1e
parentc7833b8f5ecc7a47e35bdf9fbb528e1869979ef5
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:
  Fix TextEdit cursorRectangle property.