diff options
| author | BogDan Vatra <bogdan@kde.org> | 2023-06-15 08:50:40 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2023-06-16 22:54:36 +0300 |
| commit | 76619eae4c4e857721529c87eb3c9d519fa2f0b7 (patch) | |
| tree | 1c58cf010dc605912f6b22b107e9770f78e0b157 /src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp | |
| parent | 77d0f3753643fa818c4bef7542f7e5d97812252c (diff) | |
Don't add prefix for BaseName
Adding the "assets:" prefix to BaseName leads to wrong names returned by
QFileInfo{"assets:/path/to/file"}.fileName().
Instead to return "file" it returns "assets:/file" which is not the
expected result.
Fixes: QTBUG-114576
Fixes: QTBUG-114219
Fixes: QTBUG-112261
Pick-to: 6.6 6.5 6.5.2
Change-Id: I574bf325300c0aedef68b1b183fa837144ad63c6
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp index c7785486b02..902dee5f25e 100644 --- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp +++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp @@ -307,9 +307,9 @@ public: return prefixedPath(m_fileName); case BaseName: if ((pos = m_fileName.lastIndexOf(u'/')) != -1) - return prefixedPath(m_fileName.mid(pos)); + return m_fileName.mid(pos + 1); else - return prefixedPath(m_fileName); + return m_fileName; case PathName: case AbsolutePathName: case CanonicalPathName: |