From a0fa1709d5b776ddbf238656e64ed9780e269cf2 Mon Sep 17 00:00:00 2001
From: Vladimir Golovnev <glassez@yandex.ru>
Date: Mon, 7 Aug 2023 07:19:43 +0300
Subject: [PATCH] Raise minimum supported Qt version to 6.5

PR #19394.
---
 CMakeLists.txt          |  2 +-
 INSTALL                 |  2 +-
 src/base/global.h       | 11 +++--------
 src/base/utils/gzip.cpp |  4 ----
 src/base/utils/io.cpp   |  4 ----
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e78fe8125..a8a233c02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ project(qBittorrent
 
 # version requirements - older versions may work, but you are on your own
 set(minBoostVersion 1.71)
-set(minQt6Version 6.2)
+set(minQt6Version 6.5.0)
 set(minOpenSSLVersion 1.1.1)
 set(minLibtorrent1Version 1.2.19)
 set(minLibtorrentVersion 2.0.9)
diff --git a/INSTALL b/INSTALL
index e3169327a..1b4f73e95 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,7 +11,7 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   - OpenSSL >= 1.1.1
 
-  - Qt 6.2.0 - 6.x
+  - Qt 6.5.0 - 6.x
 
   - zlib >= 1.2.11
 
diff --git a/src/base/global.h b/src/base/global.h
index 5e38af844..bd714058d 100644
--- a/src/base/global.h
+++ b/src/base/global.h
@@ -29,8 +29,11 @@
 #pragma once
 
 #include <type_traits>
+
 #include <QtGlobal>
 
+#include <QString>
+
 #if (QT_POINTER_SIZE == 8)
 #define QBT_APP_64BIT
 #endif
@@ -46,14 +49,6 @@ constexpr typename std::add_const_t<T> asConst(T &&t) noexcept { return std::for
 template <typename T>
 void asConst(const T &&) = delete;
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 4, 0))
-// https://doc.qt.io/qt-6/qstring.html#operator-22-22_s
-inline QString operator"" _s(const char16_t *str, const std::size_t size)
-{
-    return operator""_qs(str, size);
-}
-#else
 using namespace Qt::Literals::StringLiterals;
-#endif
 
 inline const QString TORRENT_FILE_EXTENSION = u".torrent"_s;
diff --git a/src/base/utils/gzip.cpp b/src/base/utils/gzip.cpp
index 91c850442..9419d1ba6 100644
--- a/src/base/utils/gzip.cpp
+++ b/src/base/utils/gzip.cpp
@@ -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();
 
diff --git a/src/base/utils/io.cpp b/src/base/utils/io.cpp
index 902297d6d..6eba4dd48 100644
--- a/src/base/utils/io.cpp
+++ b/src/base/utils/io.cpp
@@ -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)