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

QNetworkInformation: guard deprecated method definitions

Browse Source 
The definitions of the deprecated methods were not guarded by the
QT_DEPRECATED_SINCE() check, which causes compilation errors when trying
to get rid of the deprecated APIs using QT_DISABLE_DEPRECATED_BEFORE.

Task-number: QTBUG-105126
Pick-to: 6.4
Change-Id: Iff7a5bbde743b4351b98c58090da44fe05c4654a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Ivan Solovev 2022-07-25 13:10:06 +02:00
parent 2648b4ad2c
commit 2979df59b9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -662,6 +662,7 @@ bool QNetworkInformation::loadBackendByName(QStringView backend)
return loadedBackend && loadedBackend->backendName().compare(backend, Qt::CaseInsensitive) == 0; return loadedBackend && loadedBackend->backendName().compare(backend, Qt::CaseInsensitive) == 0;
} }
#if QT_DEPRECATED_SINCE(6,4)
/*! /*!
\deprecated [6.4] Use loadBackendByName() instead. \deprecated [6.4] Use loadBackendByName() instead.
@ -671,6 +672,7 @@ bool QNetworkInformation::load(QStringView backend)
{ {
return loadBackendByName(backend); return loadBackendByName(backend);
} }
#endif // QT_DEPRECATED_SINCE(6,4)
/*! /*!
Load a backend which supports \a features. Load a backend which supports \a features.
@ -686,6 +688,7 @@ bool QNetworkInformation::loadBackendByFeatures(Features features)
return loadedBackend && loadedBackend->supports(features); return loadedBackend && loadedBackend->supports(features);
} }
#if QT_DEPRECATED_SINCE(6,4)
/*! /*!
\deprecated [6.4] Use loadBackendByFeatures() instead. \deprecated [6.4] Use loadBackendByFeatures() instead.
@ -695,6 +698,7 @@ bool QNetworkInformation::load(Features features)
{ {
return loadBackendByFeatures(features); return loadBackendByFeatures(features);
} }
#endif // QT_DEPRECATED_SINCE(6,4)
/*! /*!
Returns a list of the names of all currently available backends. Returns a list of the names of all currently available backends.