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>
Fri, 8 Apr 2011 00:36:29 +0000 (10:36 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 8 Apr 2011 00:36:29 +0000 (10:36 +1000)
commit75fd46451cabd680d16913d5dfd4733c09db3459
treeff705d7f0df9382750005a39d284ad3c0200df5b
parenta43c406311e4888b2a1d8a6bbf099041022c7e54
parentbaaa5ae00038c34c8a7539229cda083a8afde280
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 bug fix: fix auto test regressions
  Cocoa: p1 bug fix: revert use of subWindowStacking
src/corelib/global/qnamespace.qdoc