diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-15 16:11:09 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-15 16:11:09 (GMT) |
| commit | 13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530 (patch) | |
| tree | c2dadf2c74e4e5b663d57cab23e096a56b5e9039 /src/gui/dialogs/qfiledialog.cpp | |
| parent | 51fe84689320f9443117196fec2ee25c6353b79b (diff) | |
| parent | 7e22fb22acffe1d0f101a8ab3ef05a4ef7ad9b83 (diff) | |
| download | Qt-13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530.zip Qt-13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530.tar.gz Qt-13240f5f0cdb08ec4dbb80482bd0d7d95cb6b530.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/dialogs/qfiledialog.cpp')
| -rw-r--r-- | src/gui/dialogs/qfiledialog.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index 3d59463..21650bb 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -1222,12 +1222,6 @@ QFileDialog::ViewMode QFileDialog::viewMode() const void QFileDialog::setFileMode(QFileDialog::FileMode mode) { Q_D(QFileDialog); - if (d->nativeDialogInUse){ - d->model->setFilter(d->filterForMode(filter())); - d->setFilter_sys(); - return; - } - d->fileMode = mode; d->retranslateWindowTitle(); @@ -1263,6 +1257,11 @@ void QFileDialog::setFileMode(QFileDialog::FileMode mode) } } setLabelText(Accept, buttonText); + if (d->nativeDialogInUse){ + d->setFilter_sys(); + return; + } + d->qFileDialogUi->fileTypeCombo->setEnabled(!testOption(ShowDirsOnly)); d->_q_updateOkButton(); } @@ -1300,6 +1299,10 @@ void QFileDialog::setAcceptMode(QFileDialog::AcceptMode mode) d->qFileDialogUi->lookInCombo->setEditable(false); } d->retranslateWindowTitle(); +#if defined(Q_WS_MAC) + d->deleteNativeDialog_sys(); + setAttribute(Qt::WA_DontShowOnScreen, false); +#endif } /* |