summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2019-11-09 18:44:04 +0100
committerTopi Reinio <topi.reinio@qt.io>2019-11-11 10:43:04 +0100
commit5b34b19b0a37624a3f5846a949112929ef5feeeb (patch)
tree80413f4c13d1fd0d9112242904dc2772b13324dc
parent88f408f90d760df73c431336ab318b3af66b9572 (diff)
downloadqtwebsockets-5b34b19b0a37624a3f5846a949112929ef5feeeb.tar.gz
Doc: Remove broken documentation comments
QWebSocketServer::nativeDescriptor() and its setter were documented twice, with the duplicated versions under Qt6-specific version check macro and marked \deprecated. QDoc still parses those in Qt5 as it doesn't respect the version guards - remove the offending comments for now. Fixes: QTBUG-79816 Change-Id: Ie40190c9d32f91efd3428b7f884c9ad923a2bb0e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/websockets/qwebsocketserver.cpp25
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