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, 21 Apr 2011 13:18:20 +0000 (23:18 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 21 Apr 2011 13:18:20 +0000 (23:18 +1000)
commit87c03292dce257f1f72d3fdc4e9457f1e1269ce2
tree2f18f87f0fc96349b3ae36687a8e4b31a0e089be
parent43bce78bd5a41115ab5a541243cc3edcecd2904e
parentf14ac31c86eeb53d0b08c799ad0ad895d17475d6
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:
  Document section behavior when not ordered by section
  Fix TextInput cursor position unchanged when selection length is 0.
  Fix TextInput echoMode clearing inputMethodHints set by the user.
  Elide has unexpected effect on Text's implicitWidth