diff options
| author | Firat Agdas <firatagdas@gmail.com> | 2014-07-16 21:27:31 +0300 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-07-24 16:26:46 +0200 |
| commit | d3298bd60f7580a22b95d34120cf57270a7c5888 (patch) | |
| tree | 093b1e2060b054375f9d10b580000c928b80db68 /src/bluetooth/qbluetoothsocket_p.h | |
| parent | ede528d4675ba1d8b60eed377c82716bd1a221a5 (diff) | |
Fixed QTBUG-40172 Android Bluetooth Socket Connection fails in some cases.
Change-Id: Ibc4c835a9778bfa220ad6553f2c0140a7727d75d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h index a93029de..cde9d33b 100644 --- a/src/bluetooth/qbluetoothsocket_p.h +++ b/src/bluetooth/qbluetoothsocket_p.h @@ -95,13 +95,15 @@ public: ~QBluetoothSocketPrivate(); //On QNX and Android we connect using the uuid not the port -#if defined(QT_QNX_BLUETOOTH) || defined(QT_ANDROID_BLUETOOTH) +#if defined(QT_QNX_BLUETOOTH) void connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid, QIODevice::OpenMode openMode); +#elif defined(QT_ANDROID_BLUETOOTH) + void connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid, QIODevice::OpenMode openMode, int fallbackServiceChannel = 1); #else void connectToService(const QBluetoothAddress &address, quint16 port, QIODevice::OpenMode openMode); #endif #ifdef QT_ANDROID_BLUETOOTH - void connectToServiceConc(const QBluetoothAddress &address, const QBluetoothUuid &uuid, QIODevice::OpenMode openMode); + void connectToServiceConc(const QBluetoothAddress &address, const QBluetoothUuid &uuid, QIODevice::OpenMode openMode, int fallbackServiceChannel = 1); #endif |