Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 11:47:55 +0000 (21:47 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 23 May 2011 11:47:55 +0000 (21:47 +1000)
commit60cea67af05ffe08458a281c96b9be62c591ce93
treeafdf2f260f2a150ec048809313d8207f0e04612c
parent4050f125267743204c593462f3d7bcec824cd64c
parent5feefb0c039dae04290d1fca7c2f24276b6f7582
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Enablers for TextInput