diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 09:42:01 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 09:42:13 +0200 |
| commit | fc2a206322f6190226ebc1f04062f2c9170f0bac (patch) | |
| tree | 7df8ca41816c24ccfa6e0c6add4612689a933bdd /src/bluetooth/osx/osxbluetooth_p.h | |
| parent | ca5490859338f28e30104668a353275d23df1ec6 (diff) | |
| parent | 125cdccc346903d6e70ed26289cdaed85e26ec3f (diff) | |
Merge remote-tracking branch 'gerrit/dev' into btle
Change-Id: Ia1cbaac9774ce2bc1b6972c02bad34fa593d40ff
Diffstat (limited to 'src/bluetooth/osx/osxbluetooth_p.h')
| -rw-r--r-- | src/bluetooth/osx/osxbluetooth_p.h | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/src/bluetooth/osx/osxbluetooth_p.h b/src/bluetooth/osx/osxbluetooth_p.h index 93842e77..ea1b388f 100644 --- a/src/bluetooth/osx/osxbluetooth_p.h +++ b/src/bluetooth/osx/osxbluetooth_p.h @@ -54,47 +54,10 @@ #include <QtCore/qglobal.h> -#ifndef QT_OSX_BLUETOOTH - #include <CoreBluetooth/CoreBluetooth.h> -#else - -#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) - -#include <CoreBluetooth/CoreBluetooth.h> -#include <IOBluetooth/IOBluetooth.h> - -#else - -// CoreBluetooth with SDK 10.9 seems to be broken: the class CBPeripheralManager is enabled on macOS -// but some of its declarations are using a disabled enum CBPeripheralAuthorizationStatus -// (disabled using __attribute__ syntax and NS_ENUM_AVAILABLE macro). -// This + -std=c++11 ends with a compilation error. For the SDK 10.9 we can: -// 1. either undefine NS_ENUM_AVAILABLE macro (it works somehow) and redefine it as an empty sequence -// of pp-tokens or -// 2. define __attribute__ as an empty sequence. Both solutions look quite ugly. - -#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9) && !QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_10) - -// Must be included BEFORE CoreBluetooth.h: -#include <Foundation/Foundation.h> - -#define CB_ERROR_WORKAROUND_REQUIRED -#undef NS_ENUM_AVAILABLE -#define NS_ENUM_AVAILABLE(_mac, _ios) - -#endif // SDK version == 10.9 - -// In SDK below 10.12 IOBluetooth.h includes CoreBluetooth.h. +#ifdef Q_OS_MACOS #include <IOBluetooth/IOBluetooth.h> +#endif -#ifdef CB_ERROR_WORKAROUND_REQUIRED -#undef __attribute__ -#undef CB_ERROR_WORKAROUND_REQUIRED -#endif // WORKAROUND - -#endif // SDK - -#endif // QT_OSX_BLUETOOTH #endif // OSXBLUETOOTH_P_H |