From adc7d65ca66df4cc12d9a0fab00e4c213e1a0869 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Thu, 4 Apr 2013 08:49:30 +0200 Subject: [PATCH] DeviceManager: Fix regression introduced by change id I38e4ea9da92 DeviceManager::fromMap() returned empty list of devices. Change-Id: Iee0d1d102a8ff0855fb855fbde512f9a7f9ecee2 Reviewed-by: Christian Kandeler --- .../projectexplorer/devicesupport/devicemanager.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index c2eada0ef86..ad2115221ff 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -163,10 +163,11 @@ void DeviceManager::load() break; } } - d->devices << device; + addDevice(device); } // Append the new SDK devices to the model. - d->devices << sdkDevices; + foreach (const IDevice::Ptr &sdkDevice, sdkDevices) + addDevice(sdkDevice); ensureOneDefaultDevicePerType(); @@ -189,7 +190,7 @@ QList DeviceManager::fromMap(const QVariantMap &map) continue; const IDevice::Ptr device = factory->restore(map); QTC_ASSERT(device, continue); - addDevice(device); + devices << device; } return devices; }