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

KitInformation: Fix warning about invalid devices

Browse Source 
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: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-11-29 12:17:53 +01:00
parent f59b84362a
commit ac7349682f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -357,11 +357,10 @@ QList<Task> DeviceKitInformation::validate(const Kit *k) const
void DeviceKitInformation::fix(Kit *k) void DeviceKitInformation::fix(Kit *k)
{ {
IDevice::ConstPtr dev = DeviceKitInformation::device(k); IDevice::ConstPtr dev = DeviceKitInformation::device(k);
if (!dev.isNull() && dev->type() == DeviceTypeKitInformation::deviceTypeId(k)) if (!dev.isNull() && dev->type() != DeviceTypeKitInformation::deviceTypeId(k)) {
return;
qWarning("Device is no longer known, removing from kit \"%s\".", qPrintable(k->displayName())); qWarning("Device is no longer known, removing from kit \"%s\".", qPrintable(k->displayName()));
setDeviceId(k, Core::Id()); setDeviceId(k, Core::Id());
}
} }
void DeviceKitInformation::setup(Kit *k) void DeviceKitInformation::setup(Kit *k)