diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index 5f5fd861d..c32fffaf3 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -63,7 +63,9 @@ #include #include #include +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) #include +#endif #include #include #include @@ -465,7 +467,9 @@ Session::Session(QObject *parent) , m_statistics {new Statistics {this}} , m_ioThread {new QThread {this}} , m_recentErroredTorrentsTimer {new QTimer {this}} +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) , m_networkManager {new QNetworkConfigurationManager {this}} +#endif { if (port() < 0) m_port = Utils::Random::rand(1024, 65535); @@ -506,11 +510,13 @@ Session::Session(QObject *parent) , &Net::ProxyConfigurationManager::proxyConfigurationChanged , this, &Session::configureDeferred); +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) // Network configuration monitor connect(m_networkManager, &QNetworkConfigurationManager::onlineStateChanged, this, &Session::networkOnlineStateChanged); connect(m_networkManager, &QNetworkConfigurationManager::configurationAdded, this, &Session::networkConfigurationChange); connect(m_networkManager, &QNetworkConfigurationManager::configurationRemoved, this, &Session::networkConfigurationChange); connect(m_networkManager, &QNetworkConfigurationManager::configurationChanged, this, &Session::networkConfigurationChange); +#endif m_resumeDataSavingManager = new ResumeDataSavingManager {m_resumeFolderPath}; m_resumeDataSavingManager->moveToThread(m_ioThread); @@ -2445,6 +2451,7 @@ void Session::setTempPath(QString path) torrent->handleTempPathChanged(); } +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) void Session::networkOnlineStateChanged(const bool online) { LogMsg(tr("System network status changed to %1", "e.g: System network status changed to ONLINE").arg(online ? tr("ONLINE") : tr("OFFLINE")), Log::INFO); @@ -2465,6 +2472,7 @@ void Session::networkConfigurationChange(const QNetworkConfiguration &cfg) configureListeningInterface(); } } +#endif QStringList Session::getListeningIPs() const { diff --git a/src/base/bittorrent/session.h b/src/base/bittorrent/session.h index ac5d39e26..7a32f6869 100644 --- a/src/base/bittorrent/session.h +++ b/src/base/bittorrent/session.h @@ -53,8 +53,10 @@ #include "trackerentry.h" class QFile; +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) class QNetworkConfiguration; class QNetworkConfigurationManager; +#endif class QString; class QThread; class QTimer; @@ -542,9 +544,11 @@ namespace BitTorrent void handleDownloadFinished(const Net::DownloadResult &result); void fileSearchFinished(const TorrentID &id, const QString &savePath, const QStringList &fileNames); +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) // Session reconfiguration triggers void networkOnlineStateChanged(bool online); void networkConfigurationChange(const QNetworkConfiguration &); +#endif private: struct MoveStorageJob @@ -784,8 +788,9 @@ namespace BitTorrent SessionStatus m_status; CacheStatus m_cacheStatus; - +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) QNetworkConfigurationManager *m_networkManager = nullptr; +#endif QList m_moveStorageQueue;