Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sun, 10 Oct 2010 22:00:56 +0000 (00:00 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 10 Oct 2010 22:00:56 +0000 (00:00 +0200)
commitf4a7f53b3ccf72e336c598286422b18ca960cf57
tree7bf66bc4f7dcf0090057766410d462f737d7c01d
parent79f20ff18232f5b9a8df061a74b08948dadb7b8b
parent7702bd86f2c0a9b2dc1ddcd745445f8c3fd2602f
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Doc: Fixed qdoc warning.