diff options
| author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-09-04 10:23:05 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-09-16 15:27:09 +0200 |
| commit | dc34c7aae7d4d641f4d06990141c7915542363ee (patch) | |
| tree | c0245f807242b904ba44f5268d3551938cb4e5f8 /src/bluetooth/qbluetoothserviceinfo_p.h | |
| parent | 982eeb3547f85dc76e5864559ee56db74a7dd86f (diff) | |
Port QBluetoothServiceInfo and QBluetoothServiceDiscoveryAgent to OS X.
QBluetoothServiceInfo and QBluetoothServiceDiscoveryAgent - version for
OS X (IOBluetooth-based).
Update 0: initial dummy version + mods to enable this new classes to be built
with qtconnectivity.
Update 1: SDP query + initial implementation of a services discovery agent.
Update 2: aux functions to "parse" a service records once I got it.
Update 3: extract services UUIDs on a discovered device, if any.
Update 4: refactor
Update 5: "fix" asserts
Update 6: more asserts fixed.
Update 7: add the ability to stop SDP query (to be tested!!!)
Update 8: mods as suggested in review.
Update 9: no reason to check the size of discoveredDevices after 'clear' call.
Update 10: set an error and error description only if it's a 'singleDevice'.
Update 11: fix private header (_p suffix).
Update 12: on 10.7 (with quite old clang) there is no 'subscript operator'
syntax for NSDictionary.
Change-Id: Ib3b07b49e3ed6381af75fb8b1e29cdf1e7a11237
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothserviceinfo_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothserviceinfo_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothserviceinfo_p.h b/src/bluetooth/qbluetoothserviceinfo_p.h index 7ff7132c..ea6a122a 100644 --- a/src/bluetooth/qbluetoothserviceinfo_p.h +++ b/src/bluetooth/qbluetoothserviceinfo_p.h @@ -60,6 +60,8 @@ QT_BEGIN_NAMESPACE class QBluetoothServiceInfo; +#ifndef QT_OSX_BLUETOOTH + class QBluetoothServiceInfoPrivate : public QObject { @@ -93,6 +95,8 @@ private: mutable bool registered; }; +#endif + QT_END_NAMESPACE #endif |