diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-03-12 10:47:21 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-03-12 11:00:29 +0100 |
| commit | 28d3d82a0d2f0fe8e4784a17a167c2f9f2e2420e (patch) | |
| tree | 6775afe2b2d8f7a63db717115db4cd0af0b099b4 /src/network/socket | |
| parent | 6e32de256dba95c90bcfe48f32a82171c0f077a1 (diff) | |
QtNetwork deprecations: suppress internal warnings
There're some uses we can't get rid of until the deprecated functions
are deleted, so suppress them for now.
Change-Id: I85b737eefc71f8f3ac939dfa961383220a8244af
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/qabstractsocket.h | 2 | ||||
| -rw-r--r-- | src/network/socket/qlocalsocket.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/qlocalsocket.h | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index fb792e428f..fa85f48ad5 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -469,6 +469,8 @@ SSL error notification. I.E. QSslSocket::sslErrors(). */ +#include <QtNetwork/private/qtnetworkglobal_p.h> + #include "qabstractsocket.h" #include "qabstractsocket_p.h" diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index 1482dcaab2..46d25d5677 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -207,7 +207,7 @@ Q_SIGNALS: void disconnected(); void stateChanged(QAbstractSocket::SocketState); #if QT_DEPRECATED_SINCE(5,15) - QT_DEPRECATED_X("Use QAbstractSocket::errorOccurred(QAbstractSocket::SocketError) instead") + QT_DEPRECATED_NETWORK_API_5_15_X("Use QAbstractSocket::errorOccurred(QAbstractSocket::SocketError) instead") void error(QAbstractSocket::SocketError); #endif void errorOccurred(QAbstractSocket::SocketError); diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp index 18f400fe0b..94bbb17412 100644 --- a/src/network/socket/qlocalsocket.cpp +++ b/src/network/socket/qlocalsocket.cpp @@ -37,6 +37,8 @@ ** ****************************************************************************/ +#include <QtNetwork/private/qtnetworkglobal_p.h> + #include "qlocalsocket.h" #include "qlocalsocket_p.h" diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index 9cd62abca6..200d59a309 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -118,7 +118,7 @@ Q_SIGNALS: void connected(); void disconnected(); #if QT_DEPRECATED_SINCE(5,15) - QT_DEPRECATED_X("Use QLocalSocket::errorOccurred(QLocalSocket::LocalSocketError) instead") + QT_DEPRECATED_NETWORK_API_5_15_X("Use QLocalSocket::errorOccurred(QLocalSocket::LocalSocketError) instead") void error(QLocalSocket::LocalSocketError socketError); #endif void errorOccurred(QLocalSocket::LocalSocketError socketError); |