diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-09-30 18:28:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-01 11:57:42 +0200 |
| commit | 80884c9842899094574635e872fc717aaaa8814c (patch) | |
| tree | 9b5241d587aef3aa77c0de606279c3dc042f2616 | |
| parent | 9e30601991c36878d62ac168365ce85130b6863f (diff) | |
QNX: Fix socket connection with a service info object
Change-Id: Ib33787c849ba4370bb9e99a6cc50ce30ce216f0c
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp | 8 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_qnx.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp index acc2a4dd..2ea847e6 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp @@ -160,8 +160,12 @@ void QBluetoothServiceDiscoveryAgentPrivate::remoteDevicesChanged(int fd) if (serviceName.size() == 2) { serviceInfo.setServiceUuid(QBluetoothUuid(QLatin1String(serviceName.last()))); suuid = QBluetoothUuid((quint16)(serviceName.first().toUInt(&ok,16))); - if (suuid == QBluetoothUuid::SerialPort) - protocolDescriptorList << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::Rfcomm)); + if (suuid == QBluetoothUuid::SerialPort) { + QBluetoothServiceInfo::Sequence protocol; + protocol << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::Rfcomm)) + << QVariant::fromValue(0); + protocolDescriptorList.append(QVariant::fromValue(protocol)); + } } } else { //We do not have anything better, so we set the service class UUID as service UUID diff --git a/src/bluetooth/qbluetoothsocket_qnx.cpp b/src/bluetooth/qbluetoothsocket_qnx.cpp index 1f3f1ed4..6e14ae13 100644 --- a/src/bluetooth/qbluetoothsocket_qnx.cpp +++ b/src/bluetooth/qbluetoothsocket_qnx.cpp @@ -67,7 +67,7 @@ QBluetoothSocketPrivate::~QBluetoothSocketPrivate() bool QBluetoothSocketPrivate::ensureNativeSocket(QBluetoothServiceInfo::Protocol type) { - Q_UNUSED(type); + socketType = type; return false; } |