AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtNetwork: Remove leftover deprecation macros

Browse Source 
These are no longer used

Change-Id: I05a6e34975ee3fc6a704c074ebadacba34edf4aa
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Mårten Nordheim 2020-06-12 12:53:23 +02:00
parent 0abbae240e
commit 76228da096
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/kernel/qtnetworkglobal.h
View File

@ -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

17
src/network/kernel/qtnetworkglobal_p.h
View File

@ -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