Commit ac734968 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

KitInformation: Fix warning about invalid devices



Do not warn if no device is set at all: No device is a valid value,
no reason to warn about that.

Change-Id: I2aaedb54b6400a4c7d2c711a0d004b33aba0c4cb
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent f59b8436
......@@ -357,11 +357,10 @@ QList<Task> DeviceKitInformation::validate(const Kit *k) const
void DeviceKitInformation::fix(Kit *k)
{
IDevice::ConstPtr dev = DeviceKitInformation::device(k);
if (!dev.isNull() && dev->type() == DeviceTypeKitInformation::deviceTypeId(k))
return;
qWarning("Device is no longer known, removing from kit \"%s\".", qPrintable(k->displayName()));
setDeviceId(k, Core::Id());
if (!dev.isNull() && dev->type() != DeviceTypeKitInformation::deviceTypeId(k)) {
qWarning("Device is no longer known, removing from kit \"%s\".", qPrintable(k->displayName()));
setDeviceId(k, Core::Id());
}
}
void DeviceKitInformation::setup(Kit *k)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment