Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 22 Apr 2011 16:14:11 +0000 (02:14 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 22 Apr 2011 16:14:11 +0000 (02:14 +1000)
commit399782c7911c11bba80dd37276f8de0b171c52f8
treedcc5fb186d7cf3cb94d1f0a436727ac01c7faea9
parent5d048227a3c3e4a4401be7b57cfa4b4950612223
parentcce89db1e2555cbca8fc28072e1c6dd737cec6c4
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  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