1 files changed, 31 insertions, 15 deletions

diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 45a410fb01..3c388de074 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -669,6 +669,9 @@ void QFileDialog::setOptions(Options options)
     }
     if (changed & HideNameFilterDetails)
         setNameFilters(d->nameFilters);
+
+    if (changed & ShowDirsOnly)
+        setFilter((options & ShowDirsOnly) ? filter() & ~QDir::Files : filter() | QDir::Files);
 }
 
 QFileDialog::Options QFileDialog::options() const
@@ -995,6 +998,24 @@ bool QFileDialog::isNameFilterDetailsVisible() const
 }
 
 
+/*
+    Strip the filters by removing the details, e.g. (*.*).
+*/
+QStringList qt_strip_filters(const QStringList &filters)
+{
+    QStringList strippedFilters;
+    QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp));
+    for (int i = 0; i < filters.count(); ++i) {
+        QString filterName;
+        int index = r.indexIn(filters[i]);
+        if (index >= 0)
+            filterName = r.cap(1);
+        strippedFilters.append(filterName.simplified());
+    }
+    return strippedFilters;
+}
+
+
 /*!
     \since 4.4
 
@@ -1021,20 +1042,11 @@ void QFileDialog::setNameFilters(const QStringList &filters)
     if (cleanedFilters.isEmpty())
         return;
 
-    if (testOption(HideNameFilterDetails)) {
-        QStringList strippedFilters;
-        QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp));
-        for (int i = 0; i < cleanedFilters.count(); ++i) {
-            QString filterName;
-            int index = r.indexIn(cleanedFilters[i]);
-            if (index >= 0)
-                filterName = r.cap(1);
-            strippedFilters.append(filterName.simplified());
-        }
-        d->qFileDialogUi->fileTypeCombo->addItems(strippedFilters);
-    } else {
+    if (testOption(HideNameFilterDetails))
+        d->qFileDialogUi->fileTypeCombo->addItems(qt_strip_filters(cleanedFilters));
+    else
         d->qFileDialogUi->fileTypeCombo->addItems(cleanedFilters);
-    }
+
     d->_q_useNameFilter(0);
 }
 
@@ -1085,8 +1097,12 @@ void QFileDialog::selectNameFilter(const QString &filter)
         d->selectNameFilter_sys(filter);
         return;
     }
-
-    int i = d->qFileDialogUi->fileTypeCombo->findText(filter);
+    int i;
+    if (testOption(HideNameFilterDetails)) {
+        i = d->qFileDialogUi->fileTypeCombo->findText(qt_strip_filters(qt_make_filter_list(filter)).first());
+    } else {
+        i = d->qFileDialogUi->fileTypeCombo->findText(filter);
+    }
     if (i >= 0) {
         d->qFileDialogUi->fileTypeCombo->setCurrentIndex(i);
         d->_q_useNameFilter(d->qFileDialogUi->fileTypeCombo->currentIndex());