diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-14 08:57:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-14 08:57:26 (GMT) |
| commit | d1502cb8e3ed43823d63f6e39e24b0a83625291e (patch) | |
| tree | 90d6457d3df8fb77adaa810f2a8c7ada664acebf /src/gui/dialogs | |
| parent | 00cd44c1976fb25f419e487bd6e626c5d2520727 (diff) | |
| parent | d9004ddf237a09f3b7f25128ceb83a0e79e7b1aa (diff) | |
| download | Qt-d1502cb8e3ed43823d63f6e39e24b0a83625291e.zip Qt-d1502cb8e3ed43823d63f6e39e24b0a83625291e.tar.gz Qt-d1502cb8e3ed43823d63f6e39e24b0a83625291e.tar.bz2 | |
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
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_mac.mm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm index 87850a7..1e13113 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -719,6 +719,14 @@ bool QFileDialogPrivate::setVisible_sys(bool visible) if (!visible == q->isHidden()) return false; + if (q->windowFlags() & Qt::WindowStaysOnTopHint) { + // The native file dialog tries all it can to stay + // on the NSModalPanel level. And it might also show + // its own "create directory" dialog that we cannot control. + // So we need to use the non-native version in this case... + return false; + } + #ifndef QT_MAC_USE_COCOA return visible ? showCarbonNavServicesDialog() : hideCarbonNavServicesDialog(); #else |