diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-10-03 11:22:51 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-10-04 09:22:20 +0000 |
| commit | 052e7ce371d4719df778ad8b378bcf1af14d294b (patch) | |
| tree | 4dd88edd4fa8a107cbdf4b058fc881207cebe721 /src/bluetooth/osx/osxbtdevicepair.mm | |
| parent | fa76dbf2b865f547b57803a0c38c9a86d8eab5e4 (diff) | |
CoreBluetooth - fix broken builds (macOS, iOS, tvOS, watchOS)
- With recent SDK changes CoreBluetooth is not in IOBluetooth anymore.
This makes corebluetoothwrapper_p.h even uglier, now we have to care
about v != 10.9 && v < 10.12; v == 10.9; v >= 10.12.
- Using osxbluetooth_p.h we can get rid of forward declarations (for
Obj-C classes) and weird includes like <IOBluetooth/IOBluetoothRFCOMChannel.h>
- use osxbluetooth_p.h instead (and it will correctly include
IOBluetooth/IOBluetooth.h etc.).
Change-Id: Ia85ef2e2cc1ac7b15a58864ed25d85a0772e5c86
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/bluetooth/osx/osxbtdevicepair.mm')
| -rw-r--r-- | src/bluetooth/osx/osxbtdevicepair.mm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/bluetooth/osx/osxbtdevicepair.mm b/src/bluetooth/osx/osxbtdevicepair.mm index 41c20b8b..63901803 100644 --- a/src/bluetooth/osx/osxbtdevicepair.mm +++ b/src/bluetooth/osx/osxbtdevicepair.mm @@ -61,10 +61,7 @@ PairingDelegate::~PairingDelegate() QT_END_NAMESPACE - -#ifdef QT_NAMESPACE -using namespace QT_NAMESPACE; -#endif +QT_USE_NAMESPACE @implementation QT_MANGLE_NAMESPACE(OSXBTPairing) |