diff options
Diffstat (limited to 'src/bluetooth/osx')
| -rw-r--r-- | src/bluetooth/osx/osxbtledeviceinquiry.mm | 10 | ||||
| -rw-r--r-- | src/bluetooth/osx/osxbtutility.mm | 14 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/bluetooth/osx/osxbtledeviceinquiry.mm b/src/bluetooth/osx/osxbtledeviceinquiry.mm index 70b96ab7..e64ac1db 100644 --- a/src/bluetooth/osx/osxbtledeviceinquiry.mm +++ b/src/bluetooth/osx/osxbtledeviceinquiry.mm @@ -218,7 +218,15 @@ QT_USE_NAMESPACE [elapsedTimer startWithTimeout:inquiryTimeoutMS step:timeStepMS]; } - [manager scanForPeripheralsWithServices:nil options:nil]; + // ### Qt 6.x: remove the use of env. variable, as soon as a proper public API is in place. + bool envOk = false; + const int env = qEnvironmentVariableIntValue("QT_BLUETOOTH_SCAN_ENABLE_DUPLICATES", &envOk); + if (envOk && env) { + [manager scanForPeripheralsWithServices:nil + options:@{CBCentralManagerScanOptionAllowDuplicatesKey : @YES}]; + } else { + [manager scanForPeripheralsWithServices:nil options:nil]; + } } // Else we ignore. #if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_10_0) || QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_13) } else if (state == CBManagerStateUnsupported || state == CBManagerStateUnauthorized) { diff --git a/src/bluetooth/osx/osxbtutility.mm b/src/bluetooth/osx/osxbtutility.mm index e17006de..c7fa7c42 100644 --- a/src/bluetooth/osx/osxbtutility.mm +++ b/src/bluetooth/osx/osxbtutility.mm @@ -233,11 +233,17 @@ CFStrongReference<CFUUIDRef> cf_uuid(const QBluetoothUuid &qtUuid) ObjCStrongReference<CBUUID> cb_uuid(const QBluetoothUuid &qtUuid) { - CFStrongReference<CFUUIDRef> cfUuid(cf_uuid(qtUuid)); - if (!cfUuid) - return ObjCStrongReference<CBUUID>(); + bool ok = false; + const auto asUInt16 = qToBigEndian(qtUuid.toUInt16(&ok)); + const auto asUInt128 = qtUuid.toUInt128(); - ObjCStrongReference<CBUUID> cbUuid([CBUUID UUIDWithCFUUID:cfUuid], true); //true == retain. + const NSUInteger length = ok ? sizeof asUInt16 : sizeof asUInt128; + const void *bytes = &asUInt128; + if (ok) + bytes = &asUInt16; + + NSData *uuidData = [NSData dataWithBytes:bytes length:length]; + ObjCStrongReference<CBUUID> cbUuid([CBUUID UUIDWithData:uuidData], true); // true == retain. return cbUuid; } |