Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 4 Apr 2011 09:19:06 +0000 (19:19 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 4 Apr 2011 09:19:06 +0000 (19:19 +1000)
commit7418c05b7534b1e3aa014b420081d2f94b1ac0d2
tree2e58e8f9c3fa60061893052096f8dd9c1167c77c
parentd1a21551dc31937db4b62b2406ea3820dd8a8c0a
parent3c2373d7ea9bc91bb537c0725984d19ad0fbab01
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Cocoa: p1 bugfix, add widget flag MacNoCocoaChildWindow
src/corelib/global/qnamespace.qdoc