forked from qt-creator/qt-creator
iOS: Use base IDevice::clone() instead of local toMap/fromMap
Some non-persistent data is handled in the base. Change-Id: I5f6c5429b88178115bf26f885b80fa3daebf227e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -227,14 +227,10 @@ void IosDeviceManager::deviceConnected(const QString &uid, const QString &name)
|
|||||||
} else if (dev->deviceState() != IDevice::DeviceConnected &&
|
} else if (dev->deviceState() != IDevice::DeviceConnected &&
|
||||||
dev->deviceState() != IDevice::DeviceReadyToUse) {
|
dev->deviceState() != IDevice::DeviceReadyToUse) {
|
||||||
qCDebug(detectLog) << "updating ios device " << uid;
|
qCDebug(detectLog) << "updating ios device " << uid;
|
||||||
IosDevice *newDev = nullptr;
|
if (dev->type() == devType) // FIXME: Should that be a QTC_ASSERT?
|
||||||
if (dev->type() == devType) {
|
devManager->addDevice(dev->clone());
|
||||||
newDev = new IosDevice();
|
else
|
||||||
newDev->fromMap(dev->toMap());
|
devManager->addDevice(IDevice::ConstPtr(new IosDevice(uid)));
|
||||||
} else {
|
|
||||||
newDev = new IosDevice(uid);
|
|
||||||
}
|
|
||||||
devManager->addDevice(IDevice::ConstPtr(newDev));
|
|
||||||
}
|
}
|
||||||
updateInfo(uid);
|
updateInfo(uid);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user