qiurui
/
qtconnectivity
mirror of https://github.com/qt/qtconnectivity.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CoreBluetooth - use the right enumerators/constants with SDK 10.13 

Like it was done for central manager - use the correct enumerators (types)
- with 10.13 SDK they also use 'generic' CBManagerXXX constants on macOS
instead of CBCentral/PeripheralManagerXXX constants.

Task-number: QTBUG-62658
Change-Id: I4b4de239930f5e731dc4977ff3353512290ff3b2
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
This commit is contained in:
Timur Pocheptsov 2017-09-05 13:28:53 +02:00
parent 19e6a952d9
commit ae21b2574c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bluetooth/osx/osxbtperipheralmanager.mm
View File

@ -391,7 +391,7 @@ bool qt_validate_value_range(const QLowEnergyCharacteristicData &data)
if (peripheral != manager || !notifier) if (peripheral != manager || !notifier)
return; 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) { if (peripheral.state == CBManagerStatePoweredOn) {
#else #else
if (peripheral.state == CBPeripheralManagerStatePoweredOn) { if (peripheral.state == CBPeripheralManagerStatePoweredOn) {
@ -426,7 +426,7 @@ bool qt_validate_value_range(const QLowEnergyCharacteristicData &data)
explicitly added again." 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 || if (peripheral.state == CBManagerStateUnauthorized ||
peripheral.state == CBManagerStateUnsupported) { peripheral.state == CBManagerStateUnsupported) {
#else #else