whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: QFileDialog::selectedFiles() check isLocalFile() 

call toLocalFile() only if the returned QUrl::isLocalFile() is true,
otherwise return toString(). Same thing as done for QFileDialog static
functions as in 1576f81baa.

Change-Id: I3f8cab385e32d0943587b3382a636ea3a168d518
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
bb10
Assam Boudjelthia 2020-02-22 19:51:02 +02:00 committed by Andy Shaw
parent cb1145fb26
commit ecae4732a7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/dialogs/qfiledialog.cpp
View File

@ -1298,8 +1298,12 @@ QStringList QFileDialog::selectedFiles() const
QStringList files;
const QList<QUrl> userSelectedFiles = d->userSelectedFiles();
files.reserve(userSelectedFiles.size());
for (const QUrl &file : userSelectedFiles)
files.append(file.toLocalFile());
for (const QUrl &file : userSelectedFiles) {
if (file.isLocalFile() || file.isEmpty())
files.append(file.toLocalFile());
else
files.append(file.toString());
}
if (files.isEmpty() && d->usingWidgets()) {
const FileMode fm = fileMode();
if (fm != ExistingFile && fm != ExistingFiles)