Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/corelib/text/qbytearray.cpp

Change-Id: I63706409464d31391012bacdadfd1f6300509787

1 files changed, 2 insertions, 5 deletions

diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 77fec76c6f..b268864132 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -1378,8 +1378,8 @@ QStringList qt_make_filter_list(const QString &filter)
 
     \snippet code/src_gui_dialogs_qfiledialog.cpp 6
 
-    \note This is not supported on Android's native file dialog. Use
-        \l{setMimeTypeFilters()} instead.
+    \note With Android's native file dialog, the mime type matching the given
+        name filter is used because only mime types are supported.
 
     \sa setMimeTypeFilters(), setNameFilters()
 */
@@ -1431,9 +1431,6 @@ QStringList qt_strip_filters(const QStringList &filters)
     filters for each file type. For example, JPEG images have three possible
     extensions; if your application can open such files, selecting the
     \c image/jpeg mime type as a filter will allow you to open all of them.
-
-    \note This is not supported on Android's native file dialog. Use
-        \l{setMimeTypeFilters()} instead.
 */
 void QFileDialog::setNameFilters(const QStringList &filters)
 {