diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-08-20 14:53:08 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-20 13:27:08 +0000 |
| commit | 088a9fa4c0f80a6b43bc111f44f79eb961ed941e (patch) | |
| tree | 0f3482bff06cfc1617778879fc3cbbaac6dfba5b | |
| parent | f2db3b14e96b4b2ccc2477ed36c2662c78478ded (diff) | |
Reinstate transitional methods
These were introduced in Qt5 as transitional methods, and deprecating
the main methods. They should still be here to support API conversion.
Change-Id: I251c97dca527971bf966335288855aeea10572d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit ddbddd249e0df85a35054ea9bdb88451e9f35fb1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/websockets/qwebsocketserver.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h index 049943b..686c281 100644 --- a/src/websockets/qwebsocketserver.h +++ b/src/websockets/qwebsocketserver.h @@ -111,6 +111,12 @@ public: bool setSocketDescriptor(qintptr socketDescriptor); qintptr socketDescriptor() const; +#if QT_DEPRECATED_SINCE(6, 2) + QT_DEPRECATED_VERSION_X_6_2("Use setSocketDescriptor instead") + bool setNativeDescriptor(qintptr descriptor) { return setSocketDescriptor(descriptor); } + QT_DEPRECATED_VERSION_X_6_2("Use socketDescriptor instead") + qintptr nativeDescriptor() const { return socketDescriptor(); } +#endif bool hasPendingConnections() const; virtual QWebSocket *nextPendingConnection(); |