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, 27 Apr 2011 01:47:10 +0000 (11:47 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 27 Apr 2011 01:47:10 +0000 (11:47 +1000)
commit415951891cd75170f1e4b89b46effa3319b56e4e
tree98ee694cc8b78b997879fd64358d57d9158a60f6
parent7783b04aad1d90e84e6e66a6c99f6eeca97b1342
parent10830210607d08eeb2af5d091639506a7d8cc634
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:
  Move the TextInput cursor delegate when the preedit position changes.