1 files changed, 47 insertions, 8 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
index bdc3c85e..08c1dbfa 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
@@ -423,8 +423,8 @@ void QBluetoothDeviceDiscoveryAgentPrivate::deviceFound(IOBluetoothDeviceInquiry
     deviceInfo.setCoreConfigurations(QBluetoothDeviceInfo::BaseRateCoreConfiguration);
     deviceInfo.setRssi(device.RSSI);
 
-    const QList<QBluetoothUuid> uuids(OSXBluetooth::extract_services_uuids(device));
-    deviceInfo.setServiceUuids(uuids, QBluetoothDeviceInfo::DataIncomplete);
+    const QVector<QBluetoothUuid> uuids(OSXBluetooth::extract_services_uuids(device));
+    deviceInfo.setServiceUuids(uuids);
 
     deviceFound(deviceInfo);
 }
@@ -525,14 +525,53 @@ void QBluetoothDeviceDiscoveryAgentPrivate::deviceFound(const QBluetoothDeviceIn
     const bool isLE = newDeviceInfo.coreConfigurations() == QBluetoothDeviceInfo::LowEnergyCoreConfiguration;
 
     for (int i = 0, e = discoveredDevices.size(); i < e; ++i) {
-        if (isLE ? discoveredDevices[i].deviceUuid() == newDeviceInfo.deviceUuid():
-                   discoveredDevices[i].address() == newDeviceInfo.address()) {
-            if (discoveredDevices[i] == newDeviceInfo && (!isLE || lowEnergySearchTimeout > 0))
+        if (isLE) {
+            if (discoveredDevices[i].deviceUuid() == newDeviceInfo.deviceUuid()) {
+                QBluetoothDeviceInfo::Fields updatedFields = QBluetoothDeviceInfo::Field::None;
+                if (discoveredDevices[i].rssi() != newDeviceInfo.rssi()) {
+                    qCDebug(QT_BT_OSX) << "Updating RSSI for" << newDeviceInfo.address()
+                                       << newDeviceInfo.rssi();
+                    discoveredDevices[i].setRssi(newDeviceInfo.rssi());
+                    updatedFields.setFlag(QBluetoothDeviceInfo::Field::RSSI);
+                }
+
+                if (discoveredDevices[i].manufacturerData() != newDeviceInfo.manufacturerData()) {
+                    qCDebug(QT_BT_OSX) << "Updating manufacturer data for" << newDeviceInfo.address();
+                    const QVector<quint16> keys = newDeviceInfo.manufacturerIds();
+                    for (auto key: keys)
+                        discoveredDevices[i].setManufacturerData(key, newDeviceInfo.manufacturerData(key));
+                    updatedFields.setFlag(QBluetoothDeviceInfo::Field::ManufacturerData);
+                }
+
+                if (lowEnergySearchTimeout > 0) {
+                    if (discoveredDevices[i] != newDeviceInfo) {
+                        discoveredDevices.replace(i, newDeviceInfo);
+                        emit q_ptr->deviceDiscovered(newDeviceInfo);
+                    } else {
+                        if (!updatedFields.testFlag(QBluetoothDeviceInfo::Field::None))
+                            emit q_ptr->deviceUpdated(discoveredDevices[i], updatedFields);
+                    }
+
+                    return;
+                }
+
+                discoveredDevices.replace(i, newDeviceInfo);
+                emit q_ptr->deviceDiscovered(newDeviceInfo);
+
+                if (!updatedFields.testFlag(QBluetoothDeviceInfo::Field::None))
+                    emit q_ptr->deviceUpdated(discoveredDevices[i], updatedFields);
+
                 return;
+            }
+        } else {
+            if (discoveredDevices[i].address() == newDeviceInfo.address()) {
+                if (discoveredDevices[i] == newDeviceInfo)
+                    return;
 
-            discoveredDevices.replace(i, newDeviceInfo);
-            emit q_ptr->deviceDiscovered(newDeviceInfo);
-            return;
+                discoveredDevices.replace(i, newDeviceInfo);
+                emit q_ptr->deviceDiscovered(newDeviceInfo);
+                return;
+            }
         }
     }