1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iOS File Dialog: Allow picking files if name filter is '*' (all files)

Browse Source 
Name filters may be not empty and include all files ('*'). We should
not add any file type limitations in this case. Ammends commit
ce20b81070c8283a7895e46dd79d560fb0b81462

Change-Id: I3983e576a0ada4b7b40837c5c797359114b1ae02
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit af0f13b46053254c7b2416a1f71a95d141247600)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Doris Verria 2022-12-15 21:44:10 +01:00 committed by Qt Cherry-pick Bot
parent 665c99b6c2
commit bede6b3db9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/ios/qiosdocumentpickercontroller.mm
View File

@ -23,7 +23,9 @@
results.append(QPlatformFileDialogHelper::cleanFilterList(filter)); results.append(QPlatformFileDialogHelper::cleanFilterList(filter));
docTypes = [self computeAllowedFileTypes:results]; docTypes = [self computeAllowedFileTypes:results];
} else { }
if (!docTypes.count) {
switch (fileDialog->options()->fileMode()) { switch (fileDialog->options()->fileMode()) {
case QFileDialogOptions::AnyFile: case QFileDialogOptions::AnyFile:
case QFileDialogOptions::ExistingFile: case QFileDialogOptions::ExistingFile:
@ -90,6 +92,9 @@
{ {
QStringList fileTypes; QStringList fileTypes;
for (const QString &filter : filters) { for (const QString &filter : filters) {
if (filter == (QLatin1String("*")))
continue;
if (filter.contains(u'?')) if (filter.contains(u'?'))
continue; continue;