diff options
author | Doris Verria <doris.verria@qt.io> | 2022-12-15 21:44:10 +0100 |
---|---|---|
committer | Doris Verria <doris.verria@qt.io> | 2022-12-20 16:21:01 +0100 |
commit | af0f13b46053254c7b2416a1f71a95d141247600 (patch) | |
tree | eab576ed17a1c0dcc4963789bde7022c1e606e70 /src/plugins/platforms/ios | |
parent | 8f0c366087edf8c1a6b8c2e299f18c8d269269c4 (diff) |
iOS File Dialog: Allow picking files if name filter is '*' (all files)
Name filters may be not empty and include all files ('*'). We should
not add any file type limitations in this case. Ammends commit
ce20b81070c8283a7895e46dd79d560fb0b81462
Pick-to: 6.5
Change-Id: I3983e576a0ada4b7b40837c5c797359114b1ae02
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios')
-rw-r--r-- | src/plugins/platforms/ios/qiosdocumentpickercontroller.mm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiosdocumentpickercontroller.mm b/src/plugins/platforms/ios/qiosdocumentpickercontroller.mm index 350c965e87..af866077cd 100644 --- a/src/plugins/platforms/ios/qiosdocumentpickercontroller.mm +++ b/src/plugins/platforms/ios/qiosdocumentpickercontroller.mm @@ -23,7 +23,9 @@ results.append(QPlatformFileDialogHelper::cleanFilterList(filter)); docTypes = [self computeAllowedFileTypes:results]; - } else { + } + + if (!docTypes.count) { switch (fileDialog->options()->fileMode()) { case QFileDialogOptions::AnyFile: case QFileDialogOptions::ExistingFile: @@ -90,6 +92,9 @@ { QStringList fileTypes; for (const QString &filter : filters) { + if (filter == (QLatin1String("*"))) + continue; + if (filter.contains(u'?')) continue; |