Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 12 Sep 2011 09:39:11 +0000 (19:39 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 12 Sep 2011 09:39:11 +0000 (19:39 +1000)
commit1c1a5fe0e2d9e28be5e0e14732d79d34c9bb2a74
treeaf7971ca725efcf14aedea07c933338e5c89581c
parent502c4d7e000e6accf4f86b28459a83c7c7763057
parent41bb458f095bf796d3a083eaa1c9d547f3fed745
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Migrate addMarkUp function to QChar.