5 files changed, 99 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp
index d9e9c4b17c..404700292c 100644
--- a/src/gui/kernel/qplatformdialoghelper.cpp
+++ b/src/gui/kernel/qplatformdialoghelper.cpp
@@ -359,6 +359,7 @@ public:
     QDir::Filters filters;
     QList<QUrl> sidebarUrls;
     QStringList nameFilters;
+    QStringList mimeTypeFilters;
     QString defaultSuffix;
     QStringList history;
     QUrl initialDirectory;
@@ -477,6 +478,16 @@ QStringList QFileDialogOptions::nameFilters() const
     return d->nameFilters;
 }
 
+void QFileDialogOptions::setMimeTypeFilters(const QStringList &filters)
+{
+    d->mimeTypeFilters = filters;
+}
+
+QStringList QFileDialogOptions::mimeTypeFilters() const
+{
+    return d->mimeTypeFilters;
+}
+
 void QFileDialogOptions::setDefaultSuffix(const QString &suffix)
 {
     d->defaultSuffix = suffix;
diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h
index 6d7d52ccb1..5269416ffd 100644
--- a/src/gui/kernel/qplatformdialoghelper.h
+++ b/src/gui/kernel/qplatformdialoghelper.h
@@ -265,6 +265,9 @@ public:
     void setNameFilters(const QStringList &filters);
     QStringList nameFilters() const;
 
+    void setMimeTypeFilters(const QStringList &filters);
+    QStringList mimeTypeFilters() const;
+
     void setDefaultSuffix(const QString &suffix);
     QString defaultSuffix() const;
 
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 9c4b99253a..62cec34b2b 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -57,6 +57,7 @@
 #include <stdlib.h>
 #include <qsettings.h>
 #include <qdebug.h>
+#include <qmimedatabase.h>
 #include <qapplication.h>
 #include <qstylepainter.h>
 #if !defined(Q_OS_WINCE)
@@ -1441,6 +1442,75 @@ void QFileDialog::setFilter(QDir::Filters filters)
     d->showHiddenAction->setChecked((filters & QDir::Hidden));
 }
 
+static QString nameFilterForMime(const QString &mimeType)
+{
+    QMimeDatabase db;
+    QMimeType mime(db.mimeTypeForName(mimeType));
+    if (mime.isValid()) {
+        if (mime.isDefault()) {
+            return QFileDialog::tr("All files (*)");
+        } else {
+            const QString patterns = mime.globPatterns().join(QLatin1Char(' '));
+            return mime.comment() + QStringLiteral(" (") + patterns + QLatin1Char(')');
+        }
+    }
+    return QString();
+}
+
+/*!
+    \since 5.2
+
+    Sets the \a filters used in the file dialog, from a list of MIME types.
+
+    Convenience method for setNameFilters().
+    Uses QMimeType to create a name filter from the glob patterns and description
+    defined in each MIME type.
+
+    Use application/octet-stream for the "All files (*)" filter, since that
+    is the base MIME type for all files.
+
+    Calling setMimeTypeFilters overrides any previously set name filters,
+    and changes the return value of nameFilters().
+
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 13
+*/
+void QFileDialog::setMimeTypeFilters(const QStringList &filters)
+{
+    Q_D(QFileDialog);
+    QStringList nameFilters;
+    foreach (const QString &mimeType, filters) {
+        const QString text = nameFilterForMime(mimeType);
+        if (!text.isEmpty())
+            nameFilters.append(text);
+    }
+    setNameFilters(nameFilters);
+    d->options->setMimeTypeFilters(filters);
+}
+
+/*!
+    \since 5.2
+
+    Returns the MIME type filters that are in operation on this file
+    dialog.
+*/
+QStringList QFileDialog::mimeTypeFilters() const
+{
+    return d_func()->options->mimeTypeFilters();
+}
+
+/*!
+    \since 5.2
+
+    Sets the current MIME type \a filter.
+
+*/
+void QFileDialog::selectMimeTypeFilter(const QString &filter)
+{
+    const QString text = nameFilterForMime(filter);
+    if (!text.isEmpty())
+        selectNameFilter(text);
+}
+
 /*!
     \property QFileDialog::viewMode
     \brief the way files and directories are displayed in the dialog
diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
index 5413a42ea9..404e16cde1 100644
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@@ -124,6 +124,10 @@ public:
     void selectNameFilter(const QString &filter);
     QString selectedNameFilter() const;
 
+    void setMimeTypeFilters(const QStringList &filters);
+    QStringList mimeTypeFilters() const;
+    void selectMimeTypeFilter(const QString &filter);
+
     QDir::Filters filter() const;
     void setFilter(QDir::Filters filters);
 
diff --git a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
index a253c09d8b..f0010b6f25 100644
--- a/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
@@ -129,3 +129,14 @@ QString dir = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
                                                 QFileDialog::ShowDirsOnly
                                                 | QFileDialog::DontResolveSymlinks);
 //! [12]
+
+//! [13]
+QStringList mimeTypeFilters;
+mimeTypeFilters << "image/jpeg" // will show "JPEG image (*.jpeg *.jpg *.jpe)
+            << "image/png"  // will show "PNG image (*.png)"
+            << "application/octet-stream"; // will show "All files (*)"
+
+QFileDialog dialog(this);
+dialog.setMimeTypeFilters(mimeTypeFilters);
+dialog.exec();
+//! [13]