Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
authorGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 09:38:42 +0000 (11:38 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 09:38:42 +0000 (11:38 +0200)
commitc41153e69336701488385d9194d72e72164b28b8
treeb6305df3ec9c535756c788f542af833f5b2a265c
parent9c6347f24509bff1dc6b87493adf487c22092990
parent2e0003eda4783f69a40fb4b31e7084c761d9640d
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
src/gui/text/qtextdocument.cpp