1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1648720546

Browse Source
This commit is contained in:
Qt CI Bot 2022-03-31 14:02:01 +00:00
commit c168edba21
4 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/network/kernel/qnetworkinformation.cpp
View File

@ -678,10 +678,12 @@ bool QNetworkInformation::loadDefaultBackend()
#endif #endif
if (index == -1) if (index == -1)
return false; 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 Attempts to load a backend whose name matches \a backend
(case insensitively). (case insensitively).
@ -690,12 +692,22 @@ bool QNetworkInformation::loadDefaultBackend()
\sa instance \sa instance
*/ */
bool QNetworkInformation::load(QStringView backend) bool QNetworkInformation::loadBackendByName(QStringView backend)
{ {
auto loadedBackend = QNetworkInformationPrivate::create(backend); auto loadedBackend = QNetworkInformationPrivate::create(backend);
return loadedBackend && loadedBackend->backendName().compare(backend, Qt::CaseInsensitive) == 0; 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. Load a backend which supports \a features.
@ -704,12 +716,22 @@ bool QNetworkInformation::load(QStringView backend)
\sa instance \sa instance
*/ */
bool QNetworkInformation::load(Features features) bool QNetworkInformation::loadBackendByFeatures(Features features)
{ {
auto loadedBackend = QNetworkInformationPrivate::create(features); auto loadedBackend = QNetworkInformationPrivate::create(features);
return loadedBackend && loadedBackend->supports(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. Returns a list of the names of all currently available backends.
*/ */

8
src/network/kernel/qnetworkinformation.h
View File

@ -101,8 +101,12 @@ public:
Features supportedFeatures() const; Features supportedFeatures() const;
static bool loadDefaultBackend(); static bool loadDefaultBackend();
static bool load(QStringView backend); static bool loadBackendByName(QStringView backend);
static bool load(Features features); 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 QStringList availableBackends();
static QNetworkInformation *instance(); static QNetworkInformation *instance();

8
tests/auto/network/kernel/qnetworkinformation/tst_qnetworkinformation.cpp
View File

@ -135,10 +135,10 @@ void tst_QNetworkInformation::initTestCase()
auto backends = QNetworkInformation::availableBackends(); auto backends = QNetworkInformation::availableBackends();
QVERIFY(backends.size() > prevBackends.size()); QVERIFY(backends.size() > prevBackends.size());
QVERIFY(backends.contains(u"mock")); QVERIFY(backends.contains(u"mock"));
QVERIFY(QNetworkInformation::load(u"mock")); QVERIFY(QNetworkInformation::loadBackendByName(u"mock"));
QVERIFY(QNetworkInformation::load(u"mock")); QVERIFY(QNetworkInformation::loadBackendByName(u"mock"));
QVERIFY(QNetworkInformation::load(u"mOcK")); QVERIFY(QNetworkInformation::loadBackendByName(u"mOcK"));
QVERIFY(!QNetworkInformation::load(u"mocks")); QVERIFY(!QNetworkInformation::loadBackendByName(u"mocks"));
} }
void tst_QNetworkInformation::cleanupTestCase() void tst_QNetworkInformation::cleanupTestCase()

4
tests/auto/network/kernel/qnetworkinformation_appless/tst_qnetworkinformation_appless.cpp
View File

@ -48,7 +48,7 @@ void tst_QNetworkInformation_appless::reinit()
if (QNetworkInformation::availableBackends().isEmpty()) if (QNetworkInformation::availableBackends().isEmpty())
QSKIP("No backends available!"); QSKIP("No backends available!");
QVERIFY(QNetworkInformation::load(QNetworkInformation::Feature::Reachability)); QVERIFY(QNetworkInformation::loadDefaultBackend());
auto info = QNetworkInformation::instance(); auto info = QNetworkInformation::instance();
QVERIFY(info); QVERIFY(info);
} }
@ -57,7 +57,7 @@ void tst_QNetworkInformation_appless::reinit()
{ {
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
QVERIFY(QNetworkInformation::load(QNetworkInformation::Feature::Reachability)); QVERIFY(QNetworkInformation::loadDefaultBackend());
auto info = QNetworkInformation::instance(); auto info = QNetworkInformation::instance();
QVERIFY(info); QVERIFY(info);
} }