From ac7349682fccf8fe5d4b4c9a1b4af10a2379cad5 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 29 Nov 2013 12:17:53 +0100 Subject: [PATCH] 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: Daniel Teske --- src/plugins/projectexplorer/kitinformation.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index 23edc2d2aba..87c6caf3201 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -357,11 +357,10 @@ QList 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)