Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 18 Feb 2010 12:05:13 +0000 (13:05 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 18 Feb 2010 12:05:13 +0000 (13:05 +0100)
commit4f4cc6e0ea79e1c363fd6f62de16c96f9c82b375
tree446e1a1912e2bc74634adb1b4c58d6cdf0e8f703
parent7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508
parent2e8af9b06f7c25710253e517325644b5fa1ba17f
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  Help system: Remove hard-coded qt namespace.
  Help system: Handle all Clucene exceptions.