diff options
Diffstat (limited to 'src/libs/installer/binaryformat.h')
| -rw-r--r-- | src/libs/installer/binaryformat.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/libs/installer/binaryformat.h b/src/libs/installer/binaryformat.h index 3bd8a6aa3..e7505a341 100644 --- a/src/libs/installer/binaryformat.h +++ b/src/libs/installer/binaryformat.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2023 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -58,11 +58,15 @@ public: Resource(const QString &path, const Range<qint64> &segment); ~Resource(); +#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0) bool open(); - void close(); +#else + bool open(std::optional<QFile::Permissions> permissions = std::nullopt); +#endif + void close() override; - bool seek(qint64 pos); - qint64 size() const; + bool seek(qint64 pos) override; + qint64 size() const override; QByteArray name() const; void setName(const QByteArray &name); @@ -74,10 +78,10 @@ public: static void copyData(Resource *archive, QFileDevice *out); private: - qint64 readData(char *data, qint64 maxSize); - qint64 writeData(const char *data, qint64 maxSize); + qint64 readData(char *data, qint64 maxSize) override; + qint64 writeData(const char *data, qint64 maxSize) override; - bool open(OpenMode mode) { return QIODevice::open(mode); } + bool open(OpenMode mode) override { return QIODevice::open(mode); } void setOpenMode(OpenMode mode) { QIODevice::setOpenMode(mode); } private: |