Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 30 Sep 2010 23:28:55 +0000 (01:28 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 30 Sep 2010 23:28:55 +0000 (01:28 +0200)
commite2c45cbacaa0f48e1397572d3e5baa847c86e9b1
tree25842df9ab9b23b23a8c2dc2f74eac1abf84ab17
parent7468727b7bf5728502c2928c71185a67bbd6de0b
parentc2d539bbb25220105ee79de6d0d59e686508d765
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Build fix for -qtnamespace.