Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

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