diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 07:50:11 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 07:50:11 +0200 |
| commit | 013ad0570844975cd5c72a77d1cfefa30c3ea656 (patch) | |
| tree | 9fb1d5afc8b29f97a60ca20d514269b9d1658ef2 /src/bluetooth/osx/osxbtperipheralmanager.mm | |
| parent | 18af3226765b62312acc8f801cc531fde0d9822b (diff) | |
| parent | 80d85141aa496583c5cfa6dd0f62d5eb4a8ba660 (diff) | |
Merge remote-tracking branch 'gerrit/5.9' into 5.10v5.10.0-beta3
Change-Id: I84bfe86751c27eabb4e75912ae3c0b4d3781faf1
Diffstat (limited to 'src/bluetooth/osx/osxbtperipheralmanager.mm')
| -rw-r--r-- | src/bluetooth/osx/osxbtperipheralmanager.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/osx/osxbtperipheralmanager.mm b/src/bluetooth/osx/osxbtperipheralmanager.mm index 9c443cf6..64c8cd90 100644 --- a/src/bluetooth/osx/osxbtperipheralmanager.mm +++ b/src/bluetooth/osx/osxbtperipheralmanager.mm @@ -391,7 +391,7 @@ bool qt_validate_value_range(const QLowEnergyCharacteristicData &data) if (peripheral != manager || !notifier) return; -#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) +#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_13) if (peripheral.state == CBManagerStatePoweredOn) { #else if (peripheral.state == CBPeripheralManagerStatePoweredOn) { @@ -426,7 +426,7 @@ bool qt_validate_value_range(const QLowEnergyCharacteristicData &data) explicitly added again." */ -#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) +#if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_13) if (peripheral.state == CBManagerStateUnauthorized || peripheral.state == CBManagerStateUnsupported) { #else |