diff options
Diffstat (limited to 'src/bluetooth/osx/osxbtledeviceinquiry.mm')
-rw-r--r-- | src/bluetooth/osx/osxbtledeviceinquiry.mm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/bluetooth/osx/osxbtledeviceinquiry.mm b/src/bluetooth/osx/osxbtledeviceinquiry.mm index 2dabd0c1..3ce66d49 100644 --- a/src/bluetooth/osx/osxbtledeviceinquiry.mm +++ b/src/bluetooth/osx/osxbtledeviceinquiry.mm @@ -364,13 +364,10 @@ QT_USE_NAMESPACE return; } - QString name; - if (peripheral.name) - name = QString::fromNSString(peripheral.name); - const AdvertisementData qtAdvData(advertisementData); - if (!name.size()) // Probably, it's not possible to have one and not the other. - name = qtAdvData.localName; + QString name(qtAdvData.localName); + if (!name.size() && peripheral.name) + name = QString::fromNSString(peripheral.name); // TODO: fix 'classOfDevice' (0 for now). QBluetoothDeviceInfo newDeviceInfo(deviceUuid, name, 0); |