diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-07-25 14:42:06 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-07-25 14:42:18 +0200 |
| commit | 25638b02766ae3109bfc83b3249e6d0dc9e21bdb (patch) | |
| tree | 8ac8f0cd544dd39da674657940d6c509ea94721c /src/bluetooth/qbluetoothsocket_osx_p.h | |
| parent | fc2a206322f6190226ebc1f04062f2c9170f0bac (diff) | |
| parent | b19148f9a0f820630bd83432d96117e9598c315d (diff) | |
Merge remote-tracking branch 'gerrit/dev' into btlebtle
Change-Id: Id7698ec157a4e06296bcc27d48aaa8325dd3c23a
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_osx_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_osx_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothsocket_osx_p.h b/src/bluetooth/qbluetoothsocket_osx_p.h index ce376702..dcc684b8 100644 --- a/src/bluetooth/qbluetoothsocket_osx_p.h +++ b/src/bluetooth/qbluetoothsocket_osx_p.h @@ -79,10 +79,9 @@ QT_BEGIN_NAMESPACE -class QBluetoothServiceDiscoveryAgent; class QBluetoothAddress; -class QBluetoothSocketPrivate : public QBluetoothSocketPrivateBase, public OSXBluetooth::ChannelDelegate +class QBluetoothSocketPrivate : public QBluetoothSocketBasePrivate, public OSXBluetooth::ChannelDelegate { friend class QBluetoothSocket; friend class QBluetoothServer; @@ -121,8 +120,6 @@ private: qint64 writeData(const char *data, qint64 maxSize); qint64 readData(char *data, qint64 maxSize); - QBluetoothSocket *q_ptr; - QScopedPointer<QBluetoothServiceDiscoveryAgent> discoveryAgent; QPrivateLinearBuffer buffer; |