QFileDialog : Fix filters that doesn't work if whitespaces at the end

The fix is basically remove the whitespaces at the end otherwise the
reg exp will be wrong.

Task-number: 240789
Reviewed-by: jasplin

2 files changed, 26 insertions, 6 deletions

diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 5131271..b20321f 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -957,25 +957,29 @@ void QFileDialog::setNameFilters(const QStringList &filters)
 {
     Q_D(QFileDialog);
     d->defaultFileTypes = (filters == QStringList(QFileDialog::tr("All Files (*)")));
-    d->nameFilters = filters;
+    QStringList cleanedFilters;
+    for (int i = 0; i < filters.count(); ++i) {
+        cleanedFilters << filters[i].simplified();
+    }
+    d->nameFilters = cleanedFilters;
 
     if (d->nativeDialogInUse){
-        d->setNameFilters_sys(filters);
+        d->setNameFilters_sys(cleanedFilters);
         return;
     }
 
     d->qFileDialogUi->fileTypeCombo->clear();
-    if (filters.isEmpty())
+    if (cleanedFilters.isEmpty())
         return;
 
     if (testOption(HideNameFilterDetails)) {
         QStringList strippedFilters;
-        for (int i = 0; i < filters.count(); ++i) {
-            strippedFilters.append(filters[i].mid(0, filters[i].indexOf(QLatin1String(" ("))));
+        for (int i = 0; i < cleanedFilters.count(); ++i) {
+            strippedFilters.append(cleanedFilters[i].mid(0, cleanedFilters[i].indexOf(QLatin1String(" ("))));
         }
         d->qFileDialogUi->fileTypeCombo->addItems(strippedFilters);
     } else {
-        d->qFileDialogUi->fileTypeCombo->addItems(filters);
+        d->qFileDialogUi->fileTypeCombo->addItems(cleanedFilters);
     }
     d->_q_useNameFilter(0);
 }
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp
index bade586..695bfe7 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp
@@ -681,6 +681,22 @@ void tst_QFiledialog::filters()
     for (int i = views.at(0)->currentIndex(); i < views.at(0)->count(); ++i)
         views.at(0)->setCurrentIndex(i);
     QCOMPARE(spyFilterSelected.count(), 0);
+
+    //Let check if filters with whitespaces
+    QNonNativeFileDialog fd2;
+    QStringList expected;
+    expected << "C++ Source Files(*.cpp)";
+    expected << "Any(*.*)";
+    fd2.setFilter("C++ Source Files(*.cpp);;Any(*.*)");
+    QCOMPARE(expected, fd2.filters());
+    fd2.setFilter("C++ Source Files(*.cpp) ;;Any(*.*)");
+    QCOMPARE(expected, fd2.filters());
+    fd2.setFilter("C++ Source Files(*.cpp);; Any(*.*)");
+    QCOMPARE(expected, fd2.filters());
+    fd2.setFilter(" C++ Source Files(*.cpp);; Any(*.*)");
+    QCOMPARE(expected, fd2.filters());
+    fd2.setFilter("C++ Source Files(*.cpp) ;; Any(*.*)");
+    QCOMPARE(expected, fd2.filters());
 }
 
 void tst_QFiledialog::selectFilter()