summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-09-24 10:36:48 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-25 10:37:05 +0200
commit97ad2ffecf6f5c18b71c52c5a7f4a5f8b679c0a6 (patch)
treeec735cab9143a7266b31261dce47f7eeb826a556
parente269d5d894e60dfa5e954eb75ae19754d08f3353 (diff)
Fixing small QBluetoothServer issues
-extending documentation -emit error signal when setting a new error Task-number: QTBUG-32669 Change-Id: I16b8a149792ed5068a7bd76af874477084802aea Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
-rw-r--r--src/bluetooth/qbluetoothserver.cpp3
-rw-r--r--src/bluetooth/qbluetoothserver_bluez.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothserver.cpp b/src/bluetooth/qbluetoothserver.cpp
index 6cb9ba01..967d4e71 100644
--- a/src/bluetooth/qbluetoothserver.cpp
+++ b/src/bluetooth/qbluetoothserver.cpp
@@ -175,7 +175,8 @@ QBluetoothServer::~QBluetoothServer()
which is returned can not be changed any more.
Returns a registered QBluetoothServiceInfo instance if sucessful otherwise an
- invalid QBluetoothServiceInfo.
+ invalid QBluetoothServiceInfo. This function always assumes that the default Bluetooth adapter
+ should be used.
For an RFCOMM server this function is equivalent to following code snippet.
diff --git a/src/bluetooth/qbluetoothserver_bluez.cpp b/src/bluetooth/qbluetoothserver_bluez.cpp
index 83d0b073..e8457183 100644
--- a/src/bluetooth/qbluetoothserver_bluez.cpp
+++ b/src/bluetooth/qbluetoothserver_bluez.cpp
@@ -107,6 +107,7 @@ bool QBluetoothServer::listen(const QBluetoothAddress &address, quint16 port)
int sock = d->socket->socketDescriptor();
if (sock < 0) {
d->m_lastError = InputOutputError;
+ emit error(d->m_lastError);
return false;
}