Return a correct filter from QFileDialog::selectedMimeTypeFilter()

QFileDialog::selectedMimeTypeFilter() returns either an empty
filter in the case when a platform file dialog doesn't implement
mime type filters, or initiallySelectedMimeTypeFilter() in the
case of Qt's file dialog. In both cases the result is incorrect.

Make it return a mime type filter corresponding to a selected
name filter. As a result, tst_QFiledialog::setMimeTypeFilters()
has to be fixed: QFileDialog::selectMimeTypeFilter() can't select
a name filter for an invalid mime type, and "application/json"
is not supported by RHEL 6.6, so replace it by "application/pdf".

Change-Id: I58d3be860a9b5e8a72cba86d74b520178115a812
Reviewed-by: David Faure <david.faure@kdab.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index c3bdf3701f..47d63b7d53 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -1049,12 +1049,12 @@ void tst_QFiledialog::setMimeTypeFilters_data()
     QTest::addColumn<QString>("expectedSelectedMimeTypeFilter");
 
     const auto headerMime = QStringLiteral("text/x-chdr");
-    const auto jsonMime = QStringLiteral("application/json");
+    const auto pdfMime = QStringLiteral("application/pdf");
     const auto zipMime = QStringLiteral("application/zip");
 
     QTest::newRow("single mime filter (C header file)") << QStringList {headerMime} << headerMime << headerMime;
-    QTest::newRow("single mime filter (JSON file)") << QStringList {jsonMime} << jsonMime << jsonMime;
-    QTest::newRow("multiple mime filters") << QStringList {jsonMime, zipMime} << jsonMime << jsonMime;
+    QTest::newRow("single mime filter (JSON file)") << QStringList {pdfMime} << pdfMime << pdfMime;
+    QTest::newRow("multiple mime filters") << QStringList {pdfMime, zipMime} << pdfMime << pdfMime;
 }
 
 void tst_QFiledialog::setMimeTypeFilters()
@@ -1068,6 +1068,10 @@ void tst_QFiledialog::setMimeTypeFilters()
     fd.selectMimeTypeFilter(targetMimeTypeFilter);
 
     QCOMPARE(fd.selectedMimeTypeFilter(), expectedSelectedMimeTypeFilter);
+
+    auto *filters = fd.findChild<QComboBox*>("fileTypeCombo");
+    filters->setCurrentIndex(filters->count() - 1);
+    QCOMPARE(fd.selectedMimeTypeFilter(), mimeTypeFilters.last());
 }
 
 void tst_QFiledialog::setEmptyNameFilter()