diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-12-20 03:55:03 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-12-20 03:55:03 (GMT) |
| commit | 00fcb5e473e93546f999e45c78ed940b4d4caeeb (patch) | |
| tree | b84b34de6446e5a5f191fa5a501c63f7106d168a /src/gui/dialogs/qfiledialog_mac.mm | |
| parent | 3fe6eab1e6e451457b9c060b6b643b86d3f82557 (diff) | |
| parent | 95b0418a7ee7aee9658fd19b363e73d583af0b04 (diff) | |
| download | Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.zip Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.tar.gz Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'src/gui/dialogs/qfiledialog_mac.mm')
| -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 |