diff options
Diffstat (limited to 'src/imports/bluetooth')
3 files changed, 6 insertions, 2 deletions
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h index a3cfdcf2..0aa134f5 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h @@ -60,7 +60,7 @@ #include <qbluetoothservicediscoveryagent.h> #include <qbluetoothdevicediscoveryagent.h> -#include <qbluetoothglobal.h> +#include <qtbluetoothglobal.h> #include "qdeclarativebluetoothservice_p.h" diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp index a8b4a80f..0d5a5eae 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp @@ -244,6 +244,7 @@ void QDeclarativeBluetoothSocket::setConnected(bool connected) \li \c{ServiceNotFoundError} \li \c{NetworkError} \li \c{UnsupportedProtocolError} + \li \c{RemoteHostClosedError} \endlist The errors are derived from \l QBluetoothSocket::SocketError. This property is read-only. @@ -297,7 +298,9 @@ void QDeclarativeBluetoothSocket::socket_state(QBluetoothSocket::SocketState sta \li \c{Bound} \endlist - The states are derived from \l QBluetoothSocket::SocketState. This property is read-only. + The states (except \c{NoServiceSet}) are derived from \l QBluetoothSocket::SocketState. This property is read-only. + \c{NoServiceSet} indicates that the socket state is not yet available due to the \l service not being + set yet. */ QDeclarativeBluetoothSocket::SocketState QDeclarativeBluetoothSocket::state() const { diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h index faa2c29c..e5092d2c 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h @@ -78,6 +78,7 @@ public: enum Error { NoError = QBluetoothSocket::NoSocketError, UnknownSocketError = QBluetoothSocket::UnknownSocketError, + RemoteHostClosedError = QBluetoothSocket::RemoteHostClosedError, HostNotFoundError = QBluetoothSocket::HostNotFoundError, ServiceNotFoundError = QBluetoothSocket::ServiceNotFoundError, NetworkError = QBluetoothSocket::NetworkError, |