diff options
| -rw-r--r-- | src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/platform/android/tst_android.cpp | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp index c7785486b0..902dee5f25 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: diff --git a/tests/auto/corelib/platform/android/tst_android.cpp b/tests/auto/corelib/platform/android/tst_android.cpp index bb1fdcae1c..1be12e0c33 100644 --- a/tests/auto/corelib/platform/android/tst_android.cpp +++ b/tests/auto/corelib/platform/android/tst_android.cpp @@ -13,6 +13,8 @@ #include <qpa/qplatformnativeinterface.h> #include <QtCore/qdiriterator.h> +using namespace Qt::StringLiterals; + class tst_Android : public QObject { Q_OBJECT @@ -64,10 +66,14 @@ void tst_Android::assetsIterating() QDirIterator it("assets:/top_level_dir", QDirIterator::Subdirectories); QStringList iteratorAssets; - while (it.hasNext()) - iteratorAssets.append(it.next()); + while (it.hasNext()) + iteratorAssets.append(it.next()); + + QVERIFY(assets == iteratorAssets); - QVERIFY(assets == iteratorAssets); + auto entryList = QDir{"assets:/"_L1}.entryList(QStringList{"*.txt"_L1}); + QCOMPARE(entryList.size(), 1); + QCOMPARE(entryList[0], "test.txt"_L1); } void tst_Android::testAndroidSdkVersion() |