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, 12 May 2011 03:04:01 +0000 (13:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 May 2011 03:04:01 +0000 (13:04 +1000)
commita4e406277bc6af457d26134d654f17df553330fc
tree4ba940003a96ef34262ced7f072f8dbb06638ae7
parent7744f0d6bf5a8c4395ecf1a2bfe09c392e8d8cd1
parent6fbfb1ab3f26ad672eb24f9b4a0ce1a8eea08298
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:
  Don't crash on an invalid replacementStart from an input method.