Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 11 Apr 2011 10:58:18 +0000 (20:58 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 11 Apr 2011 10:58:18 +0000 (20:58 +1000)
commit935d4fc9504af2696f7d91b2074290b02f811da8
treead8450d4f06309ea789ef8173b91270504a1ea57
parentd9c84c26dc212b2f170dfb48346df7c439e6f759
parentb033bb91ea6fd32989cc59904aa79db9a188bf5b
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Make sure removed QTextBlock is invalid