diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-07-25 13:10:06 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-25 17:29:20 +0000 |
| commit | c731bffdc2e36294e0af3183a9b786982dd32b66 (patch) | |
| tree | ec9bd0dc23c32f1e51f1fdf2feefd114a6757cbe /src/network | |
| parent | 901e22ea011733c6e4c645525301d5f4a42c42ac (diff) | |
| download | qtbase-c731bffdc2e36294e0af3183a9b786982dd32b66.tar.gz | |
QNetworkInformation: guard deprecated method definitions
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
Change-Id: Iff7a5bbde743b4351b98c58090da44fe05c4654a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 2979df59b97b06e0056e23bc81d30e831c3ef0ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkinformation.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkinformation.cpp b/src/network/kernel/qnetworkinformation.cpp index a2f00fadb4..8abd3fceeb 100644 --- a/src/network/kernel/qnetworkinformation.cpp +++ b/src/network/kernel/qnetworkinformation.cpp @@ -662,6 +662,7 @@ bool QNetworkInformation::loadBackendByName(QStringView backend) return loadedBackend && loadedBackend->backendName().compare(backend, Qt::CaseInsensitive) == 0; } +#if QT_DEPRECATED_SINCE(6,4) /*! \deprecated [6.4] Use loadBackendByName() instead. @@ -671,6 +672,7 @@ bool QNetworkInformation::load(QStringView backend) { return loadBackendByName(backend); } +#endif // QT_DEPRECATED_SINCE(6,4) /*! Load a backend which supports \a features. @@ -686,6 +688,7 @@ bool QNetworkInformation::loadBackendByFeatures(Features features) return loadedBackend && loadedBackend->supports(features); } +#if QT_DEPRECATED_SINCE(6,4) /*! \deprecated [6.4] Use loadBackendByFeatures() instead. @@ -695,6 +698,7 @@ bool QNetworkInformation::load(Features features) { return loadBackendByFeatures(features); } +#endif // QT_DEPRECATED_SINCE(6,4) /*! Returns a list of the names of all currently available backends. |