summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/target.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2012-06-20 15:44:44 +0200
committerTobias Hunger <tobias.hunger@nokia.com>2012-06-21 12:09:41 +0200
commit7315f6cddd10ca07f8675709bff0a11e4ad1a9f0 (patch)
tree490d7757f99f938b52b6786a6b5f58073996ec6a /src/plugins/projectexplorer/target.cpp
parent0d9e4b7405808241dc7c85f901101c786214ba61 (diff)
downloadqt-creator-7315f6cddd10ca07f8675709bff0a11e4ad1a9f0.tar.gz
Target: Simplify code a bit and fix a possible qWarning
Change-Id: Idb4f7a39221fd3147d3e1ff1001b327532870c08 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/projectexplorer/target.cpp')
-rw-r--r--src/plugins/projectexplorer/target.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index a35c37aca7..5879c1b1b1 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)