diff options
| author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-09-30 17:12:02 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-10-01 15:07:07 +0200 |
| commit | 2917e641defac2302e8204bb0570a5150b9923d4 (patch) | |
| tree | b6d4b45cb38e560c41ed12d94558b15e4d1f5be6 /src/bluetooth/qbluetoothsocket_osx_p.h | |
| parent | f835812b24b47f1d5a6766fd227ca32559295129 (diff) | |
QtBluetooth - enable auto tests on OS X.
The first patch to enable tests - does not require any modifications
in tests, just enabling the test.
Add fix for publishedRecordWithDictioinary - this function is new in 10.9,
deprecating withSDPRe..., but it crashed the test on 10.7 (and the same must happen
on 10.8).
Change-Id: I38e92cbc6f72fcaf8034824ef734148111139e0a
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothsocket_osx_p.h b/src/bluetooth/qbluetoothsocket_osx_p.h index 2823c4f0..31389ec0 100644 --- a/src/bluetooth/qbluetoothsocket_osx_p.h +++ b/src/bluetooth/qbluetoothsocket_osx_p.h @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE class QBluetoothServiceDiscoveryAgent; class QBluetoothAddress; -class QBluetoothSocketPrivate : public QObject, public OSXBluetooth::ChannelDelegate +class QBluetoothSocketPrivate : public QBluetoothSocketPrivateBase, public OSXBluetooth::ChannelDelegate { friend class QBluetoothSocket; friend class QBluetoothServer; |