From 5b34b19b0a37624a3f5846a949112929ef5feeeb Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Sat, 9 Nov 2019 18:44:04 +0100 Subject: 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 --- src/websockets/qwebsocketserver.cpp | 25 ------------------------- 1 file changed, 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 -- cgit v1.2.1