summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2022-06-22 15:52:19 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-28 11:44:58 +0000
commit84530d293f98b7f8694a27e4de5bd2875719107a (patch)
treec1de4bc1c5a2d6c0a52ade80e7119c7ac7a29553 /src
parentea0b5a3ea63da5bba528465c21bb4152067635e5 (diff)
Fix documentation issues and enable documentation testing in CI
This will fail the integration of changes that introduce new documentation warnings. Change-Id: I503b123417308f7ba264422a78850e6188a10a48 Reviewed-by: Luca Di Sera <luca.disera@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 74215aeed1c27b56acd266673ba4447b287c145d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/bluetooth/doc/qtbluetooth.qdocconf3
-rw-r--r--src/bluetooth/qbluetoothsocket.cpp12
-rw-r--r--src/nfc/doc/qtnfc.qdocconf3
3 files changed, 13 insertions, 5 deletions
diff --git a/src/bluetooth/doc/qtbluetooth.qdocconf b/src/bluetooth/doc/qtbluetooth.qdocconf
index 5040acfc..d8bc6e7a 100644
--- a/src/bluetooth/doc/qtbluetooth.qdocconf
+++ b/src/bluetooth/doc/qtbluetooth.qdocconf
@@ -46,3 +46,6 @@ imagedirs += images
navigation.landingpage = "Qt Bluetooth"
navigation.cppclassespage = "Qt Bluetooth C++ Classes"
+
+# Fail the documentation build if there are more warnings than the limit
+warninglimit = 0
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp
index 74acfd1b..59c09ddc 100644
--- a/src/bluetooth/qbluetoothsocket.cpp
+++ b/src/bluetooth/qbluetoothsocket.cpp
@@ -752,13 +752,15 @@ void QBluetoothSocket::close()
}
/*!
- Set the socket to use \a socketDescriptor with a type of \a socketType,
- which is in state, \a socketState, and mode, \a openMode.
+ \fn bool QBluetoothSocket::setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType, SocketState socketState, OpenMode openMode)
- The set socket descriptor is considered owned by the QBluetoothSocket
- and may be e.g. closed once finished.
+ Sets the socket to use \a socketDescriptor with a type of \a socketType,
+ which is in state \a socketState, and mode \a openMode.
- Returns true on success
+ The socket descriptor is owned by the QBluetoothSocket instance and may
+ be closed once finished.
+
+ Returns \c true on success.
*/
// ### Qt 7 consider making this function private. The qbluetoothsocket_bluez backend is the
diff --git a/src/nfc/doc/qtnfc.qdocconf b/src/nfc/doc/qtnfc.qdocconf
index 7d69c45d..f3c39bf2 100644
--- a/src/nfc/doc/qtnfc.qdocconf
+++ b/src/nfc/doc/qtnfc.qdocconf
@@ -43,3 +43,6 @@ imagedirs += images
navigation.landingpage = "Qt NFC"
navigation.cppclassespage = "Qt NFC C++ Classes"
+
+# Fail the documentation build if there are more warnings than the limit
+warninglimit = 0