diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-15 13:16:24 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-15 13:16:24 (GMT) |
| commit | 1c1d3e79e1b7cb2cdffaee38a98bc777e3a7b961 (patch) | |
| tree | 5c33473950b22db0a0eb9c230005cd8e7f251538 /src/gui/dialogs | |
| parent | cace8e6a9f00ee478dfe63a7fa6959056cfe7e8a (diff) | |
| parent | 0c6780c39d18a4fd06b9bed94400de365a518c45 (diff) | |
| download | Qt-1c1d3e79e1b7cb2cdffaee38a98bc777e3a7b961.zip Qt-1c1d3e79e1b7cb2cdffaee38a98bc777e3a7b961.tar.gz Qt-1c1d3e79e1b7cb2cdffaee38a98bc777e3a7b961.tar.bz2 | |
Merge branch '4.7' into mimir
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/dialogs.pri | 2 | ||||
| -rw-r--r-- | src/gui/dialogs/qfiledialog_mac.mm | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri index c25b6d5..12e3a71 100644 --- a/src/gui/dialogs/dialogs.pri +++ b/src/gui/dialogs/dialogs.pri @@ -109,7 +109,7 @@ SOURCES += \ dialogs/qprintpreviewdialog.cpp symbian:contains(QT_CONFIG, s60) { - LIBS += -lcommondialogs + LIBS += -lCommonDialogs SOURCES += dialogs/qfiledialog_symbian.cpp \ dialogs/qcolordialog_symbian.cpp } 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 |