diff options
Diffstat (limited to 'src/plugins/platforms')
5 files changed, 13 insertions, 6 deletions
diff --git a/src/plugins/platforms/android/androidcontentfileengine.cpp b/src/plugins/platforms/android/androidcontentfileengine.cpp index 2c47b71c88..b18c81e896 100644 --- a/src/plugins/platforms/android/androidcontentfileengine.cpp +++ b/src/plugins/platforms/android/androidcontentfileengine.cpp @@ -54,8 +54,10 @@ AndroidContentFileEngine::AndroidContentFileEngine(const QString &f) setFileName(f); } -bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode) +bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode, + std::optional<QFile::Permissions> permissions) { + Q_UNUSED(permissions); QString openModeStr; if (openMode & QFileDevice::ReadOnly) { openModeStr += QLatin1Char('r'); diff --git a/src/plugins/platforms/android/androidcontentfileengine.h b/src/plugins/platforms/android/androidcontentfileengine.h index 31eaf9b0ab..531d0f80ff 100644 --- a/src/plugins/platforms/android/androidcontentfileengine.h +++ b/src/plugins/platforms/android/androidcontentfileengine.h @@ -46,7 +46,7 @@ class AndroidContentFileEngine : public QFSFileEngine { public: AndroidContentFileEngine(const QString &fileName); - bool open(QIODevice::OpenMode openMode) override; + bool open(QIODevice::OpenMode openMode, std::optional<QFile::Permissions> permissions) override; qint64 size() const override; FileFlags fileFlags(FileFlags type = FileInfoAll) const override; QString fileName(FileName file = DefaultName) const override; diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp index 7326889222..0c6fb92ffb 100644 --- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp +++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp @@ -261,8 +261,10 @@ public: close(); } - bool open(QIODevice::OpenMode openMode) override + bool open(QIODevice::OpenMode openMode, std::optional<QFile::Permissions> permissions) override { + Q_UNUSED(permissions); + if (m_isFolder || (openMode & QIODevice::WriteOnly)) return false; close(); @@ -358,7 +360,7 @@ public: m_fileName = cleanedAssetPath(file); switch (FolderIterator::fileType(m_fileName)) { case AssetItem::Type::File: - open(QIODevice::ReadOnly); + open(QIODevice::ReadOnly, std::nullopt); break; case AssetItem::Type::Folder: m_isFolder = true; diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h index c3283436a6..3bb9fab1fc 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h @@ -54,7 +54,7 @@ public: QIOSFileEngineAssetsLibrary(const QString &fileName); ~QIOSFileEngineAssetsLibrary(); - bool open(QIODevice::OpenMode openMode) override; + bool open(QIODevice::OpenMode openMode, std::optional<QFile::Permissions> permissions) override; bool close() override; FileFlags fileFlags(FileFlags type) const override; qint64 size() const override; diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm index e2f35dc1bf..9cb38a3461 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm @@ -353,8 +353,11 @@ ALAsset *QIOSFileEngineAssetsLibrary::loadAsset() const return m_data->m_asset; } -bool QIOSFileEngineAssetsLibrary::open(QIODevice::OpenMode openMode) +bool QIOSFileEngineAssetsLibrary::open(QIODevice::OpenMode openMode, + std::optional<QFile::Permissions> permissions) { + Q_UNUSED(permissions); + if (openMode & (QIODevice::WriteOnly | QIODevice::Text)) return false; return loadAsset(); |