diff options
author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-10-22 13:39:52 +0200 |
---|---|---|
committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-12-04 01:27:08 +0100 |
commit | 56e13acf4eaaaff69156faa21d0a560fb93091d5 (patch) | |
tree | a455e0092d76561c1583e53356e4bafd690869f5 /src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp | |
parent | 56bd1b76d2e81c58a80bf6b5d74219c6b1ab8499 (diff) |
QAbstractFileEngine: Add permission argument to open()
The new argument allows atomic creation of files with non-default
permissions.
Task-number: QTBUG-79750
Change-Id: I4c49455b41f924ba87148302c8d0f77f5de0832b
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp')
-rw-r--r-- | src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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; |