diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:04:25 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-16 03:04:25 +0100 |
commit | b45ebeece5ee63a94b4ac3c10347e2e14e1fa311 (patch) | |
tree | 25d7fd844b5867d6ce201242c9a5d0945e7b23f6 | |
parent | b21c809462d1f2698781bea5a05ec59e7ddf548b (diff) | |
parent | 5b34b19b0a37624a3f5846a949112929ef5feeeb (diff) | |
download | qtwebsockets-b45ebeece5ee63a94b4ac3c10347e2e14e1fa311.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9b0aaaa5d918a28bdd388e3c1988e0bc804255db
-rw-r--r-- | src/websockets/qwebsocketserver.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp index eafe3fd..b833503 100644 --- a/src/websockets/qwebsocketserver.cpp +++ b/src/websockets/qwebsocketserver.cpp @@ -656,31 +656,6 @@ qintptr QWebSocketServer::socketDescriptor() const return d->socketDescriptor(); } -/*! - \fn QWebSocketServer::nativeDescriptor - \deprecated - - Returns the native socket descriptor the server uses to listen for incoming instructions, - or -1 if the server is not listening. - If the server is using QNetworkProxy, the returned descriptor may not be usable with - native socket functions. - - \sa socketDescriptor(), setSocketDescriptor(), setNativeDescriptor(), isListening() - \since 5.12 - */ -/*! - \fn QWebSocketServer::setNativeDescriptor - \deprecated - - Sets the socket descriptor this server should use when listening for incoming connections to - \a socketDescriptor. - - Returns true if the socket is set successfully; otherwise returns false. - The socket is assumed to be in listening state. - - \sa socketDescriptor(), setSocketDescriptor(), nativeDescriptor(), isListening() - \since 5.12 - */ #else // ### Qt 6: Remove leftovers /*! \deprecated |