diff options
4 files changed, 37 insertions, 11 deletions
diff --git a/src/network/kernel/qnetworkinformation.cpp b/src/network/kernel/qnetworkinformation.cpp index 626439572a..bd67e51795 100644 --- a/src/network/kernel/qnetworkinformation.cpp +++ b/src/network/kernel/qnetworkinformation.cpp @@ -678,10 +678,12 @@ bool QNetworkInformation::loadDefaultBackend() #endif if (index == -1) return false; - return load(QNetworkInformationBackend::PluginNames[index]); + return loadBackendByName(QNetworkInformationBackend::PluginNames[index]); } /*! + \since 6.4 + Attempts to load a backend whose name matches \a backend (case insensitively). @@ -690,13 +692,23 @@ bool QNetworkInformation::loadDefaultBackend() \sa instance */ -bool QNetworkInformation::load(QStringView backend) +bool QNetworkInformation::loadBackendByName(QStringView backend) { auto loadedBackend = QNetworkInformationPrivate::create(backend); return loadedBackend && loadedBackend->backendName().compare(backend, Qt::CaseInsensitive) == 0; } /*! + \deprecated [6.4] Use loadBackendByName() instead. + + \sa loadBackendByName(), loadDefaultBackend(), loadBackendByFeatures() +*/ +bool QNetworkInformation::load(QStringView backend) +{ + return loadBackendByName(backend); +} + +/*! Load a backend which supports \a features. Returns \c true if it managed to load the requested backend or @@ -704,13 +716,23 @@ bool QNetworkInformation::load(QStringView backend) \sa instance */ -bool QNetworkInformation::load(Features features) +bool QNetworkInformation::loadBackendByFeatures(Features features) { auto loadedBackend = QNetworkInformationPrivate::create(features); return loadedBackend && loadedBackend->supports(features); } /*! + \deprecated [6.4] Use loadBackendByFeatures() instead. + + \sa loadBackendByName(), loadDefaultBackend(), loadBackendByFeatures() +*/ +bool QNetworkInformation::load(Features features) +{ + return loadBackendByFeatures(features); +} + +/*! Returns a list of the names of all currently available backends. */ QStringList QNetworkInformation::availableBackends() diff --git a/src/network/kernel/qnetworkinformation.h b/src/network/kernel/qnetworkinformation.h index 0c8093ed1c..c21871eb29 100644 --- a/src/network/kernel/qnetworkinformation.h +++ b/src/network/kernel/qnetworkinformation.h @@ -101,8 +101,12 @@ public: Features supportedFeatures() const; static bool loadDefaultBackend(); - static bool load(QStringView backend); - static bool load(Features features); + static bool loadBackendByName(QStringView backend); + static bool loadBackendByFeatures(Features features); +#if QT_DEPRECATED_SINCE(6,4) + QT_DEPRECATED_VERSION_X_6_4("Use loadBackendByName") static bool load(QStringView backend); + QT_DEPRECATED_VERSION_X_6_4("Use loadBackendByFeatures") static bool load(Features features); +#endif static QStringList availableBackends(); static QNetworkInformation *instance(); diff --git a/tests/auto/network/kernel/qnetworkinformation/tst_qnetworkinformation.cpp b/tests/auto/network/kernel/qnetworkinformation/tst_qnetworkinformation.cpp index e37db514e3..88a471d6fc 100644 --- a/tests/auto/network/kernel/qnetworkinformation/tst_qnetworkinformation.cpp +++ b/tests/auto/network/kernel/qnetworkinformation/tst_qnetworkinformation.cpp @@ -135,10 +135,10 @@ void tst_QNetworkInformation::initTestCase() auto backends = QNetworkInformation::availableBackends(); QVERIFY(backends.size() > prevBackends.size()); QVERIFY(backends.contains(u"mock")); - QVERIFY(QNetworkInformation::load(u"mock")); - QVERIFY(QNetworkInformation::load(u"mock")); - QVERIFY(QNetworkInformation::load(u"mOcK")); - QVERIFY(!QNetworkInformation::load(u"mocks")); + QVERIFY(QNetworkInformation::loadBackendByName(u"mock")); + QVERIFY(QNetworkInformation::loadBackendByName(u"mock")); + QVERIFY(QNetworkInformation::loadBackendByName(u"mOcK")); + QVERIFY(!QNetworkInformation::loadBackendByName(u"mocks")); } void tst_QNetworkInformation::cleanupTestCase() diff --git a/tests/auto/network/kernel/qnetworkinformation_appless/tst_qnetworkinformation_appless.cpp b/tests/auto/network/kernel/qnetworkinformation_appless/tst_qnetworkinformation_appless.cpp index ff058e8a9b..2b708240d8 100644 --- a/tests/auto/network/kernel/qnetworkinformation_appless/tst_qnetworkinformation_appless.cpp +++ b/tests/auto/network/kernel/qnetworkinformation_appless/tst_qnetworkinformation_appless.cpp @@ -48,7 +48,7 @@ void tst_QNetworkInformation_appless::reinit() if (QNetworkInformation::availableBackends().isEmpty()) QSKIP("No backends available!"); - QVERIFY(QNetworkInformation::load(QNetworkInformation::Feature::Reachability)); + QVERIFY(QNetworkInformation::loadDefaultBackend()); auto info = QNetworkInformation::instance(); QVERIFY(info); } @@ -57,7 +57,7 @@ void tst_QNetworkInformation_appless::reinit() { QCoreApplication app(argc, argv); - QVERIFY(QNetworkInformation::load(QNetworkInformation::Feature::Reachability)); + QVERIFY(QNetworkInformation::loadDefaultBackend()); auto info = QNetworkInformation::instance(); QVERIFY(info); } |