From 7315f6cddd10ca07f8675709bff0a11e4ad1a9f0 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 20 Jun 2012 15:44:44 +0200 Subject: [PATCH] Target: Simplify code a bit and fix a possible qWarning Change-Id: Idb4f7a39221fd3147d3e1ff1001b327532870c08 Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/target.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index a35c37aca72..5879c1b1b1d 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -764,7 +764,9 @@ bool Target::fromMap(const QVariantMap &map) QVariantMap valueMap = map.value(key).toMap(); DeployConfigurationFactory *factory = DeployConfigurationFactory::find(this, valueMap); if (!factory) { - qWarning("No factory found to restore deployment configuration!"); + Core::Id id = idFromMap(valueMap); + qWarning("No factory found to restore deployment configuration of id '%s'!", + qPrintable(id.isValid() ? id.toString() : "UNKNOWN")); continue; } DeployConfiguration *dc = factory->restore(this, valueMap); @@ -795,7 +797,7 @@ bool Target::fromMap(const QVariantMap &map) // Ignore missing RCs: We will just populate them using the default ones. QVariantMap valueMap = map.value(key).toMap(); IRunConfigurationFactory *factory = IRunConfigurationFactory::find(this, valueMap); - if (!factory || !factory->canRestore(this, valueMap)) + if (!factory) continue; RunConfiguration *rc = factory->restore(this, valueMap); if (!rc)