diff options
| -rw-r--r-- | src/bluetooth/qbluetoothserviceinfo.cpp | 2 | ||||
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothsocket.cpp | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/bluetooth/qbluetoothserviceinfo.cpp b/src/bluetooth/qbluetoothserviceinfo.cpp index c38d5bbc..3a864b3c 100644 --- a/src/bluetooth/qbluetoothserviceinfo.cpp +++ b/src/bluetooth/qbluetoothserviceinfo.cpp @@ -124,7 +124,7 @@ QT_BEGIN_NAMESPACE \value DocumentationUrl URL that points to the documentation on the service.. \value ClientExecutableUrl URL that refers to the location of an application that can be used to utilize the service. \value IconUrl URL to the location of the icon representing the service. - \value AdditionalProtocolDescriptorList Additional protocols used by the service. This attribute extends the \l QBluetoothServiceInfo::ProtocolDescriptorList. + \value AdditionalProtocolDescriptorList Additional protocols used by the service. This attribute extends \c ProtocolDescriptorList. \value PrimaryLanguageBase Base index for primary language text descriptors. \value ServiceName Name of the Bluetooth service in the primary language. \value ServiceDescription Description of the Bluetooth service in the primary language. diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp index c94807a4..449e578a 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp @@ -313,13 +313,11 @@ void QDeclarativeBluetoothSocket::socket_readyRead() /*! \qmlproperty string BluetoothSocket::stringData - This property receives or sends data to remote Bluetooth device. Arrival of - data is signaled by the dataAvailable signal and can be read by - stringData. Calling sendStringData will transmit the string. + This property receives or sends data to a remote Bluetooth device. Arrival of + data can be detected by connecting to this properties changed signal and can be read via + stringData. Setting stringData will transmit the string. If excessive amounts of data are sent, the function may block sending. Reading will never block. - \sa dataAvailable - \sa sendStringData */ QString QDeclarativeBluetoothSocket::stringData() @@ -339,8 +337,6 @@ QString QDeclarativeBluetoothSocket::stringData() /*! This method transmits the string data passed with "data" to the remote device. If excessive amounts of data are sent, the function may block sending. - \sa dataAvailable - \sa stringData */ void QDeclarativeBluetoothSocket::sendStringData(const QString &data) |