Raise minimum supported Qt version to 6.5

PR #19394.
This commit is contained in:
Vladimir Golovnev
2023-08-07 07:19:43 +03:00
committed by GitHub
parent 699dc1689a
commit a0fa1709d5
5 changed files with 5 additions and 18 deletions

View File

@@ -61,11 +61,7 @@ QByteArray Utils::Gzip::compress(const QByteArray &data, const int level, bool *
if (initResult != Z_OK)
return {};
#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
QByteArray ret {static_cast<qsizetype>(deflateBound(&strm, data.size())), Qt::Uninitialized};
#else
QByteArray ret {static_cast<int>(deflateBound(&strm, data.size())), Qt::Uninitialized};
#endif
strm.next_out = reinterpret_cast<Bytef *>(ret.data());
strm.avail_out = ret.size();

View File

@@ -89,11 +89,7 @@ nonstd::expected<QByteArray, Utils::IO::ReadError> Utils::IO::readFile(const Pat
return nonstd::make_unexpected(ReadError {ReadError::ExceedSize, message});
}
#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
QByteArray ret {fileSize, Qt::Uninitialized};
#else
QByteArray ret {static_cast<int>(fileSize), Qt::Uninitialized};
#endif
const qint64 actualSize = file.read(ret.data(), fileSize);
if (actualSize < 0)