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

Android: fix QDir::entryInfoList() with content URIs

Browse Source 
Correctly return only the fileName portion from
AndroidContentFileEngineIterator::currentFileName(); which
QDirIteratorPrivate::matchesFilters() expects when looking for matches
of the file pattern provided to the QDirIterator.

Fixes: QTBUG-112738
Pick-to: 6.5 6.2 5.15
Change-Id: I98dba2df014b27f33cd7e54fab3ad2de8c7c1750
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
Assam Boudjelthia 2023-05-10 11:23:20 +03:00
parent 4710fb3528
commit f1778f34e0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/android/androidcontentfileengine.cpp
View File

@ -308,14 +308,14 @@ QString AndroidContentFileEngineIterator::currentFileName() const
{ {
if (m_index < 0 || m_index > m_files.size()) if (m_index < 0 || m_index > m_files.size())
return QString(); return QString();
// Returns a full path since contstructing a content path from the file name return m_files.at(m_index)->name();
// and a tree URI only will not point to a valid file URI.
return m_files.at(m_index)->uri().toString();
} }
QString AndroidContentFileEngineIterator::currentFilePath() const QString AndroidContentFileEngineIterator::currentFilePath() const
{ {
return currentFileName(); if (m_index < 0 || m_index > m_files.size())
return QString();
return m_files.at(m_index)->uri().toString();
} }
// Start of Cursor // Start of Cursor