1 files changed, 25 insertions, 18 deletions
diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
index 3f29c26cc4..f7e112ab81 100644
--- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
+++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
@@ -11,6 +11,8 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qset.h>
 #include <QtCore/qthreadstorage.h>
+#include <QtCore/qfileselector.h>
+#include <QtCore/qpointer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -188,7 +190,7 @@ public:
 
         // We can only load images from the asset library async. And this might take time, since it
         // involves showing the authorization dialog. But the QFile API is synchronuous, so we need to
-        // wait until we have access to the data. [ALAssetLibrary assetForUrl:] will shedule a block on
+        // wait until we have access to the data. [ALAssetLibrary assetForUrl:] will schedule a block on
         // the current thread. But instead of spinning the event loop to force the block to execute, we
         // wrap the call inside a synchronuous dispatch queue so that it executes on another thread.
         dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
@@ -256,8 +258,8 @@ public:
     QIOSAssetEnumerator *m_enumerator;
 
     QIOSFileEngineIteratorAssetsLibrary(
-            QDir::Filters filters, const QStringList &nameFilters)
-        : QAbstractFileEngineIterator(filters, nameFilters)
+            const QString &path, QDir::Filters filters, const QStringList &nameFilters)
+        : QAbstractFileEngineIterator(path, filters, nameFilters)
         , m_enumerator(new QIOSAssetEnumerator([[[ALAssetsLibrary alloc] init] autorelease], ALAssetsGroupAll))
     {
     }
@@ -268,8 +270,11 @@ public:
         g_iteratorCurrentUrl.setLocalData(QString());
     }
 
-    QString next() override
+    bool advance() override
     {
+        if (!m_enumerator->hasNext())
+            return false;
+
         // Cache the URL that we are about to return, since QDir will immediately create a
         // new file engine on the file and ask if it exists. Unless we do this, we end up
         // creating a new ALAsset just to verify its existence, which will be especially
@@ -277,12 +282,7 @@ public:
         ALAsset *asset = m_enumerator->next();
         QString url = QUrl::fromNSURL([asset valueForProperty:ALAssetPropertyAssetURL]).toString();
         g_iteratorCurrentUrl.setLocalData(url);
-        return url;
-    }
-
-    bool hasNext() const override
-    {
-        return m_enumerator->hasNext();
+        return true;
     }
 
     QString currentFileName() const override
@@ -344,6 +344,17 @@ QAbstractFileEngine::FileFlags QIOSFileEngineAssetsLibrary::fileFlags(QAbstractF
 {
     QAbstractFileEngine::FileFlags flags;
     const bool isDir = (m_assetUrl == "assets-library://"_L1);
+    if (!isDir) {
+        static const QFileSelector fileSelector;
+        static const auto selectors = fileSelector.allSelectors();
+        if (m_assetUrl.startsWith("assets-library://"_L1)) {
+            for (const auto &selector : selectors) {
+                if (m_assetUrl.endsWith(selector))
+                    return flags;
+            }
+        }
+    }
+
     const bool exists = isDir || m_assetUrl == g_iteratorCurrentUrl.localData() || loadAsset();
 
     if (!exists)
@@ -427,15 +438,11 @@ void QIOSFileEngineAssetsLibrary::setFileName(const QString &file)
 
 #ifndef QT_NO_FILESYSTEMITERATOR
 
-QAbstractFileEngine::Iterator *QIOSFileEngineAssetsLibrary::beginEntryList(
-        QDir::Filters filters, const QStringList &filterNames)
-{
-    return new QIOSFileEngineIteratorAssetsLibrary(filters, filterNames);
-}
-
-QAbstractFileEngine::Iterator *QIOSFileEngineAssetsLibrary::endEntryList()
+QAbstractFileEngine::IteratorUniquePtr
+QIOSFileEngineAssetsLibrary::beginEntryList(
+    const QString &path, QDir::Filters filters, const QStringList &filterNames)
 {
-    return 0;
+    return std::make_unique<QIOSFileEngineIteratorAssetsLibrary>(path, filters, filterNames);
 }
 
 QT_END_NAMESPACE