diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-14 16:07:58 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-14 16:07:58 +0100 |
commit | bcc26fb35caab3a00e9968e70cc98080a517a2f1 (patch) | |
tree | 0cf3d61cfda4cea06b4e0f7882266a9dec629b43 /src | |
parent | a165ff0b29940a469ad8b4a46bd5dad2e2ee6d88 (diff) | |
parent | 9902dfdbc44934ce2e8072bc237ca8cdbfb3402b (diff) |
Merge remote-tracking branch 'gerrit/stable' into dev
Conflicts:
src/bluetooth/qbluetoothserver.cpp
src/bluetooth/qbluetoothserver.h
Change-Id: Ia99c341ab6b4fb30d9ceb9e4516c7083eed1c547
Diffstat (limited to 'src')
-rw-r--r-- | src/bluetooth/qbluetoothserver.cpp | 3 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothserver.h | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothserviceinfo_bluez.cpp | 2 | ||||
-rw-r--r-- | src/bluetooth/qbluetoothsocket.cpp | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/bluetooth/qbluetoothserver.cpp b/src/bluetooth/qbluetoothserver.cpp index 670b522f..3a7e495f 100644 --- a/src/bluetooth/qbluetoothserver.cpp +++ b/src/bluetooth/qbluetoothserver.cpp @@ -216,10 +216,9 @@ QBluetoothServiceInfo QBluetoothServer::listen(const QBluetoothUuid &uuid, const serviceInfo.setAttribute(QBluetoothServiceInfo::BluetoothProfileDescriptorList, classId); - //Android requires custom uuid to be set as service class and not as service uuid + //Android requires custom uuid to be set as service class classId.prepend(QVariant::fromValue(uuid)); serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceClassIds, classId); - serviceInfo.setServiceUuid(uuid); QBluetoothServiceInfo::Sequence protocolDescriptorList; diff --git a/src/bluetooth/qbluetoothserver.h b/src/bluetooth/qbluetoothserver.h index 9b1d54c4..61573843 100644 --- a/src/bluetooth/qbluetoothserver.h +++ b/src/bluetooth/qbluetoothserver.h @@ -97,7 +97,7 @@ public: Q_SIGNALS: void newConnection(); - void error(QBluetoothServer::Error); + void error(QBluetoothServer::Error error); protected: QBluetoothServerPrivate *d_ptr; diff --git a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp index b9120c07..bde3e264 100644 --- a/src/bluetooth/qbluetoothserviceinfo_bluez.cpp +++ b/src/bluetooth/qbluetoothserviceinfo_bluez.cpp @@ -266,8 +266,6 @@ bool QBluetoothServiceInfoPrivate::registerService(const QBluetoothAddress &loca stream.writeEndDocument(); - qCDebug(QT_BT_BLUEZ) << xmlServiceRecord; - if (!registered) { QDBusPendingReply<uint> reply = service->AddRecord(xmlServiceRecord); reply.waitForFinished(); diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp index bd4b43fb..c7aea0b7 100644 --- a/src/bluetooth/qbluetoothsocket.cpp +++ b/src/bluetooth/qbluetoothsocket.cpp @@ -587,6 +587,7 @@ void QBluetoothSocket::discoveryFinished() qCDebug(QT_BT) << "Didn't find any"; d->errorString = tr("Service cannot be found"); setSocketError(ServiceNotFoundError); + setSocketState(QBluetoothSocket::UnconnectedState); d->discoveryAgent->deleteLater(); d->discoveryAgent = 0; } |