diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-29 06:51:18 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-29 06:51:18 (GMT) |
| commit | 245f2d6d8bf32dcfa28501a9944de00e1e4e1875 (patch) | |
| tree | bba1eb8796905fb1ed3d92c59f8841cf848bf2aa /src/gui/dialogs/qfiledialog.cpp | |
| parent | 7123ef04484f283ffa30ece8cb73f541bd81e830 (diff) | |
| parent | 2f91e9ce0e02f613d68b5b59d00b61c8f4f12c68 (diff) | |
| download | Qt-245f2d6d8bf32dcfa28501a9944de00e1e4e1875.zip Qt-245f2d6d8bf32dcfa28501a9944de00e1e4e1875.tar.gz Qt-245f2d6d8bf32dcfa28501a9944de00e1e4e1875.tar.bz2 | |
Merge ../../qt/master
Conflicts:
tests/auto/tests.xml
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 } /* |