Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 9 Sep 2011 06:19:06 +0000 (16:19 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 9 Sep 2011 06:19:06 +0000 (16:19 +1000)
commit121141af78771be8c2be4778ab0ee64d3d964240
tree18e041ea6e50563e087240d971ea159d8013bc00
parent3b4400e9a8a4cc1851344b057d4c4f0bcfcc0400
parent852abfca6f4c349dce9b895956922f96d82df579
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Fix double click and drag not extending word selection.
src/gui/text/qtextcontrol.cpp