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>
Tue, 14 Dec 2010 08:57:26 +0000 (18:57 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 14 Dec 2010 08:57:26 +0000 (18:57 +1000)
commitd1502cb8e3ed43823d63f6e39e24b0a83625291e
tree90d6457d3df8fb77adaa810f2a8c7ada664acebf
parent00cd44c1976fb25f419e487bd6e626c5d2520727
parentd9004ddf237a09f3b7f25128ceb83a0e79e7b1aa
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: popup hides behind window
  Cocoa: combobox does not hightlight when mouse re-hovers the first item
  Cocoa: Fix addChildWindow bug where we connect a grandparent to a child
  Cocoa: cannot use staysOnTop flag for native file dialogs
  Cocoa: make sure stays on top child windows are not levelled down
  Cocoa: native child filedialogs sometimes shows non-native on screen