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/bluetooth/qbluetoothserver.cpp | |
| 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/bluetooth/qbluetoothserver.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothserver.cpp | 3 |
1 files changed, 1 insertions, 2 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; |