diff options
| author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-09-30 16:40:52 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-10-01 07:01:30 +0200 |
| commit | 48e81b139729b58e3c72ab82f2d1642eefc3a047 (patch) | |
| tree | 292a8ae990c923ee80b2e9787f061e23afce48f0 /src/bluetooth/qbluetoothsocket_osx_p.h | |
| parent | 7b4808089eb3b37dc3e954a44f938a0c11d592d0 (diff) | |
QBluetoothSocket - bugfix and mods for OS X.
- Emit disconnected if a channel was closed by IOBluetooth (== closed externally,
not by Qt).
- Trick to enable invokeMethod to work with a private class (not parseable by moc).
- Fix inclusion guards _OSX_P_H, not _P_H (already in use).
- QBluetoothServer - update include + reset a port to 0 in 'close'.
Change-Id: Iaa35d6ca3ae1e8013b74d93a238d1afa4292a583
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_osx_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_osx_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothsocket_osx_p.h b/src/bluetooth/qbluetoothsocket_osx_p.h index 4e7511ae..2823c4f0 100644 --- a/src/bluetooth/qbluetoothsocket_osx_p.h +++ b/src/bluetooth/qbluetoothsocket_osx_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QBLUETOOTHSOCKET_P_H -#define QBLUETOOTHSOCKET_P_H +#ifndef QBLUETOOTHSOCKET_OSX_P_H +#define QBLUETOOTHSOCKET_OSX_P_H #ifdef QT_OSX_BLUETOOTH @@ -105,6 +105,7 @@ private: // L2CAP and RFCOMM delegate void setChannelError(IOReturn errorCode) Q_DECL_OVERRIDE; void channelOpenComplete() Q_DECL_OVERRIDE; + void channelClosed() Q_DECL_OVERRIDE; void readChannelData(void *data, std::size_t size) Q_DECL_OVERRIDE; void writeComplete() Q_DECL_OVERRIDE; |