diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-06-12 12:53:23 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-06-12 16:08:34 +0200 |
| commit | 76228da096d0b1defd6148d6f75e1a57e8c9f65b (patch) | |
| tree | 87af6daffab54b97017b190dc100db0de3134145 /src/network/kernel | |
| parent | 0abbae240ed3f6395d36669df570bba876bb7121 (diff) | |
QtNetwork: Remove leftover deprecation macros
These are no longer used
Change-Id: I05a6e34975ee3fc6a704c074ebadacba34edf4aa
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qtnetworkglobal.h | 13 | ||||
| -rw-r--r-- | src/network/kernel/qtnetworkglobal_p.h | 17 |
2 files changed, 0 insertions, 30 deletions
diff --git a/src/network/kernel/qtnetworkglobal.h b/src/network/kernel/qtnetworkglobal.h index b0adc9f68c..586b847816 100644 --- a/src/network/kernel/qtnetworkglobal.h +++ b/src/network/kernel/qtnetworkglobal.h @@ -55,19 +55,6 @@ QT_BEGIN_NAMESPACE # define Q_NETWORK_EXPORT #endif -// ### Qt6: Remove -// We work around an issue in ICC where it errors out during compilation of Qt by not marking it -// deprecated if ICC is used -#ifdef Q_CC_INTEL -#define QT_DEPRECATED_BEARER_MANAGEMENT -#else -#define QT_DEPRECATED_BEARER_MANAGEMENT QT_DEPRECATED_VERSION_5_15 -#endif - -// ### Qt6: Remove -#define QT_DEPRECATED_NETWORK_API_5_15 QT_DEPRECATED_VERSION_5_15 -#define QT_DEPRECATED_NETWORK_API_5_15_X QT_DEPRECATED_VERSION_X_5_15 - QT_END_NAMESPACE #endif diff --git a/src/network/kernel/qtnetworkglobal_p.h b/src/network/kernel/qtnetworkglobal_p.h index 10bc37c85e..859e3d9ebd 100644 --- a/src/network/kernel/qtnetworkglobal_p.h +++ b/src/network/kernel/qtnetworkglobal_p.h @@ -55,21 +55,4 @@ #include <QtCore/private/qglobal_p.h> #include <QtNetwork/private/qtnetwork-config_p.h> -// ### Qt6: Remove -#ifdef QT_DEPRECATED_BEARER_MANAGEMENT -#undef QT_DEPRECATED_BEARER_MANAGEMENT -#endif -#define QT_DEPRECATED_BEARER_MANAGEMENT - -// ### Qt6: Remove -#ifdef QT_DEPRECATED_NETWORK_API_5_15 -#undef QT_DEPRECATED_NETWORK_API_5_15 -#endif -#define QT_DEPRECATED_NETWORK_API_5_15 - -#ifdef QT_DEPRECATED_NETWORK_API_5_15_X -#undef QT_DEPRECATED_NETWORK_API_5_15_X -#endif -#define QT_DEPRECATED_NETWORK_API_5_15_X(x) - #endif // QTNETWORKGLOBAL_P_H |