From 33aaa867b5ef82519e90c1bb4daaea4c8f0d2006 Mon Sep 17 00:00:00 2001 From: Vladimir Golovnev Date: Sun, 27 Apr 2025 16:21:20 +0300 Subject: [PATCH] Drop support of Qt 6.5 PR #22599. --- .github/workflows/ci_ubuntu.yaml | 3 ++- .github/workflows/coverity-scan.yaml | 2 +- CMakeLists.txt | 2 +- INSTALL | 2 +- cmake/Modules/CommonConfig.cmake | 2 +- src/app/application.cpp | 2 -- src/base/bittorrent/sessionimpl.cpp | 4 ---- src/base/search/searchdownloadhandler.cpp | 2 +- src/base/search/searchhandler.cpp | 2 +- src/base/search/searchpluginmanager.cpp | 2 +- src/base/utils/foreignapps.cpp | 2 +- src/gui/utils.cpp | 2 -- test/testutilsversion.cpp | 8 -------- 13 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci_ubuntu.yaml b/.github/workflows/ci_ubuntu.yaml index 704ab0630..807eef19f 100644 --- a/.github/workflows/ci_ubuntu.yaml +++ b/.github/workflows/ci_ubuntu.yaml @@ -21,7 +21,7 @@ jobs: matrix: libt_version: ["2.0.11", "1.2.20"] qbt_gui: ["GUI=ON", "GUI=OFF"] - qt_version: ["6.5.2"] + qt_version: ["6.6.3"] env: boost_path: "${{ github.workspace }}/../boost" @@ -162,6 +162,7 @@ jobs: - name: Package AppImage run: | + rm -f "${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/gcc_64/plugins/sqldrivers/libqsqlmimer.so" ./linuxdeploy-x86_64.AppImage --appdir qbittorrent --plugin qt rm qbittorrent/apprun-hooks/* cp .github/workflows/helper/appimage/export_vars.sh qbittorrent/apprun-hooks/export_vars.sh diff --git a/.github/workflows/coverity-scan.yaml b/.github/workflows/coverity-scan.yaml index ce970c773..22c5a7082 100644 --- a/.github/workflows/coverity-scan.yaml +++ b/.github/workflows/coverity-scan.yaml @@ -16,7 +16,7 @@ jobs: matrix: libt_version: ["2.0.11"] qbt_gui: ["GUI=ON"] - qt_version: ["6.5.2"] + qt_version: ["6.6.3"] env: boost_path: "${{ github.workspace }}/../boost" diff --git a/CMakeLists.txt b/CMakeLists.txt index 86ede6b3c..97ecb3684 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.76) -set(minQt6Version 6.5.0) +set(minQt6Version 6.6.0) set(minOpenSSLVersion 3.0.2) set(minLibtorrent1Version 1.2.19) set(minLibtorrentVersion 2.0.10) diff --git a/INSTALL b/INSTALL index ec3ff78ea..b17e323fb 100644 --- a/INSTALL +++ b/INSTALL @@ -11,7 +11,7 @@ qBittorrent - A BitTorrent client in C++ / Qt - OpenSSL >= 3.0.2 - - Qt 6.5.0 - 6.x + - Qt 6.6.0 - 6.x - zlib >= 1.2.11 diff --git a/cmake/Modules/CommonConfig.cmake b/cmake/Modules/CommonConfig.cmake index b57dc4bcf..85535313a 100644 --- a/cmake/Modules/CommonConfig.cmake +++ b/cmake/Modules/CommonConfig.cmake @@ -20,7 +20,7 @@ target_compile_features(qbt_common_cfg INTERFACE ) target_compile_definitions(qbt_common_cfg INTERFACE - QT_DISABLE_DEPRECATED_UP_TO=0x060500 + QT_DISABLE_DEPRECATED_UP_TO=0x060600 QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_BYTEARRAY diff --git a/src/app/application.cpp b/src/app/application.cpp index 90e785e1a..a6666c57e 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -674,9 +674,7 @@ void Application::runExternalProgram(const QString &programTemplate, const BitTo QProcess proc; proc.setProgram(command); proc.setArguments(args); -#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) proc.setUnixProcessParameters(QProcess::UnixProcessFlag::CloseFileDescriptors); -#endif if (proc.startDetached()) { diff --git a/src/base/bittorrent/sessionimpl.cpp b/src/base/bittorrent/sessionimpl.cpp index 64d274f19..e88b7cd5c 100644 --- a/src/base/bittorrent/sessionimpl.cpp +++ b/src/base/bittorrent/sessionimpl.cpp @@ -1642,11 +1642,7 @@ void SessionImpl::endStartup(ResumeSessionContext *context) auto wakeupCheckTimer = new QTimer(this); connect(wakeupCheckTimer, &QTimer::timeout, this, [this] { -#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) const bool hasSystemSlept = m_wakeupCheckTimestamp.durationElapsed() > 100s; -#else - const bool hasSystemSlept = m_wakeupCheckTimestamp.elapsed() > std::chrono::milliseconds(100s).count(); -#endif if (hasSystemSlept) { LogMsg(tr("System wake-up event detected. Re-announcing to all the trackers...")); diff --git a/src/base/search/searchdownloadhandler.cpp b/src/base/search/searchdownloadhandler.cpp index 34289bf8c..c2dca0790 100644 --- a/src/base/search/searchdownloadhandler.cpp +++ b/src/base/search/searchdownloadhandler.cpp @@ -42,7 +42,7 @@ SearchDownloadHandler::SearchDownloadHandler(const QString &pluginName, const QS , m_downloadProcess {new QProcess(this)} { m_downloadProcess->setProcessEnvironment(m_manager->proxyEnvironment()); -#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) +#ifdef Q_OS_UNIX m_downloadProcess->setUnixProcessParameters(QProcess::UnixProcessFlag::CloseFileDescriptors); #endif connect(m_downloadProcess, qOverload(&QProcess::finished) diff --git a/src/base/search/searchhandler.cpp b/src/base/search/searchhandler.cpp index 114ddce5f..f847d187a 100644 --- a/src/base/search/searchhandler.cpp +++ b/src/base/search/searchhandler.cpp @@ -72,7 +72,7 @@ SearchHandler::SearchHandler(const QString &pattern, const QString &category, co // Load environment variables (proxy) m_searchProcess->setProcessEnvironment(m_manager->proxyEnvironment()); m_searchProcess->setProgram(Utils::ForeignApps::pythonInfo().executableName); -#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) +#ifdef Q_OS_UNIX m_searchProcess->setUnixProcessParameters(QProcess::UnixProcessFlag::CloseFileDescriptors); #endif diff --git a/src/base/search/searchpluginmanager.cpp b/src/base/search/searchpluginmanager.cpp index c79ba5d60..5caa611bf 100644 --- a/src/base/search/searchpluginmanager.cpp +++ b/src/base/search/searchpluginmanager.cpp @@ -546,7 +546,7 @@ void SearchPluginManager::update() { QProcess nova; nova.setProcessEnvironment(proxyEnvironment()); -#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) +#ifdef Q_OS_UNIX nova.setUnixProcessParameters(QProcess::UnixProcessFlag::CloseFileDescriptors); #endif diff --git a/src/base/utils/foreignapps.cpp b/src/base/utils/foreignapps.cpp index 038d5128f..d4e58c1a8 100644 --- a/src/base/utils/foreignapps.cpp +++ b/src/base/utils/foreignapps.cpp @@ -57,7 +57,7 @@ namespace info = {}; QProcess proc; -#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) +#ifdef Q_OS_UNIX proc.setUnixProcessParameters(QProcess::UnixProcessFlag::CloseFileDescriptors); #endif proc.start(exeName, {u"--version"_s}, QIODevice::ReadOnly); diff --git a/src/gui/utils.cpp b/src/gui/utils.cpp index ac5d922dc..e987d75c0 100644 --- a/src/gui/utils.cpp +++ b/src/gui/utils.cpp @@ -176,9 +176,7 @@ void Utils::Gui::openFolderSelect(const Path &path) const int lineMaxLength = 64; QProcess proc; -#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) proc.setUnixProcessParameters(QProcess::UnixProcessFlag::CloseFileDescriptors); -#endif proc.start(u"xdg-mime"_s, {u"query"_s, u"default"_s, u"inode/directory"_s}); proc.waitForFinished(); const auto output = QString::fromLocal8Bit(proc.readLine(lineMaxLength).simplified()); diff --git a/test/testutilsversion.cpp b/test/testutilsversion.cpp index 733fadac8..63d8360dd 100644 --- a/test/testutilsversion.cpp +++ b/test/testutilsversion.cpp @@ -80,9 +80,7 @@ private slots: { const Utils::Version<1> version1 {1}; QCOMPARE(version1[0], 1); -#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)) QVERIFY_THROWS_EXCEPTION(std::out_of_range, version1[1]); -#endif QCOMPARE(version1.majorNumber(), 1); // should not compile: // version1.minorNumber(); @@ -92,9 +90,7 @@ private slots: const Utils::Version<2, 1> version2 {2}; QCOMPARE(version2[0], 2); QCOMPARE(version2[1], 0); -#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)) QVERIFY_THROWS_EXCEPTION(std::out_of_range, version2[2]); -#endif QCOMPARE(version2.majorNumber(), 2); QCOMPARE(version2.minorNumber(), 0); // should not compile: @@ -105,9 +101,7 @@ private slots: QCOMPARE(version3[0], 3); QCOMPARE(version3[1], 2); QCOMPARE(version3[2], 0); -#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)) QVERIFY_THROWS_EXCEPTION(std::out_of_range, version3[3]); -#endif QCOMPARE(version3.majorNumber(), 3); QCOMPARE(version3.minorNumber(), 2); QCOMPARE(version3.revisionNumber(), 0); @@ -119,9 +113,7 @@ private slots: QCOMPARE(version4[1], 11); QCOMPARE(version4[2], 12); QCOMPARE(version4[3], 13); -#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)) QVERIFY_THROWS_EXCEPTION(std::out_of_range, version4[4]); -#endif QCOMPARE(version4.majorNumber(), 10); QCOMPARE(version4.minorNumber(), 11); QCOMPARE(version4.revisionNumber(), 12);