From 2cbd4ba7703756c3b0b5b37b118e755e5ea0bfe6 Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Fri, 14 Feb 2020 16:54:02 +0100 Subject: Fix name filters of GTK file picker Setting an empty string instead of "()" fixes that case where the file input doesn't have "accept" attribute. Task-number: QTBUG-82109 Change-Id: I8a72f819fa6d8bbab4e5f1067b38ad75ff11e118 Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Michal Klocek --- src/core/file_picker_controller.cpp | 3 +++ tests/auto/quick/qmltests/data/tst_filePicker.qml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp index 13e9437d2..62e02e126 100644 --- a/src/core/file_picker_controller.cpp +++ b/src/core/file_picker_controller.cpp @@ -172,6 +172,9 @@ QStringList FilePickerController::nameFilters(const QStringList &acceptedMimeTyp QStringList acceptedGlobs; QMimeDatabase mimeDatabase; + if (acceptedMimeTypes.isEmpty()) + return nameFilters; + for (QString type : acceptedMimeTypes) { if (type.startsWith(".")) { // A single suffix diff --git a/tests/auto/quick/qmltests/data/tst_filePicker.qml b/tests/auto/quick/qmltests/data/tst_filePicker.qml index c9572224e..15eadb2a1 100644 --- a/tests/auto/quick/qmltests/data/tst_filePicker.qml +++ b/tests/auto/quick/qmltests/data/tst_filePicker.qml @@ -267,7 +267,7 @@ TestWebEngineView { { tag: "CustomSuffix", input: ".pug", expected: ".pug", exactMatch: false}, { tag: "CustomMime", input: "dog/pug", expected: "Accepted types ()", exactMatch: true}, { tag: "CustomGlob", input: "dog/*", expected: "Accepted types ()", exactMatch: true}, - { tag: "Invalid", input: "---", expected: "Accepted types ()", exactMatch: true}, + { tag: "Invalid", input: "---", expected: undefined, exactMatch: true}, { tag: "Jpeg", input: "image/jpeg", expected: ".jpeg", exactMatch: false} ]; } -- cgit v1.2.3