feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Device support: Copy device object when adding to device manager.

Browse Source 
Otherwise the caller might (inadvertantly) keep a non-const object
around and change it behind the device manager's back.

Change-Id: I71b3e83e94397416b843006e74dcc1924abed77b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Christian Kandeler
2012-05-08 17:09:03 +02:00
parent b3a3072edd
commit 5bf0280b2a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/devicesupport/devicemanager.cpp
View File

@@ -218,9 +218,10 @@ QString DeviceManager::settingsFilePath()
return QFileInfo(pm->settings()->fileName()).absolutePath() + QLatin1String("/devices.xml"); return QFileInfo(pm->settings()->fileName()).absolutePath() + QLatin1String("/devices.xml");
} }
void DeviceManager::addDevice(const IDevice::Ptr &device) void DeviceManager::addDevice(const IDevice::Ptr &_device)
{ {
QTC_ASSERT(this != instance() || (device->isAutoDetected()), return); const IDevice::Ptr device = _device->clone();
QTC_ASSERT(this != instance() || device->isAutoDetected(), return);
QString name = device->displayName(); QString name = device->displayName();
const int pos = indexForId(device->id()); const int pos = indexForId(device->id());