From 55db6736ac7ffe374417fa7271a97fe7ccae1993 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 30 Jan 2014 10:51:27 +0100 Subject: [PATCH] Android: Don't skip first file in assets entry list We're using AAssetDir_getNextFileName() to verify that the directory exists and has content, and this moves the current file pointer to the second file in the dir, so we need to reset the pointer before iterating to populate the entry list. [ChangeLog][Android] Fixed QDir::entryList() for assets scheme to no longer skip the first file in the directory. Task-number: QTBUG-36528 Change-Id: I9938c669658330b0e11d6fbe3df8c6566fd79f5f Reviewed-by: BogDan Vatra --- .../platforms/android/qandroidassetsfileenginehandler.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp index 95844fc649c..5f77d1645a9 100644 --- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp +++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp @@ -293,6 +293,7 @@ QAbstractFileEngine * AndroidAssetsFileEngineHandler::create(const QString &file AAssetDir *assetDir = AAssetManager_openDir(m_assetManager, path.constData() + prefixSize); if (assetDir) { if (AAssetDir_getNextFileName(assetDir)) { + AAssetDir_rewind(assetDir); aad = new QSharedPointer(new AndroidAssetDir(assetDir)); m_assetsCacheMutext.lock(); m_assetsCache.insert(path, aad);