diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-03 01:00:24 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-03 01:00:25 +0100 |
| commit | 84e15d6f485fe0e9a4549d57ef39dbc3d18eeaa9 (patch) | |
| tree | b02e4541aac42302504b244f856062bda902cd0d /src/widgets/dialogs/qfiledialog_p.h | |
| parent | c6153660e458ee3790a446a327d29e622defee49 (diff) | |
| parent | 607338f98feaa2561340c7ff4249d470b36d0503 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ic0037eac1d85a0e60e7b1a590d49b5ee6205bfc8
Diffstat (limited to 'src/widgets/dialogs/qfiledialog_p.h')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog_p.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index 96d0c1190e..463c77aa23 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -164,13 +164,9 @@ public: QDir::Filters filterForMode(QDir::Filters filters) const { - const QFileDialog::FileMode fileMode = q_func()->fileMode(); - if (fileMode == QFileDialog::DirectoryOnly) { - filters |= QDir::Drives | QDir::AllDirs | QDir::Dirs; + filters |= QDir::Drives | QDir::AllDirs | QDir::Dirs | QDir::Files; + if (q_func()->testOption(QFileDialog::ShowDirsOnly)) filters &= ~QDir::Files; - } else { - filters |= QDir::Drives | QDir::AllDirs | QDir::Files | QDir::Dirs; - } return filters; } |