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

Target: Simplify code a bit and fix a possible qWarning

Browse Source 
Change-Id: Idb4f7a39221fd3147d3e1ff1001b327532870c08
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-06-20 15:44:44 +02:00
parent 0d9e4b7405
commit 7315f6cddd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/target.cpp
View File

@@ -764,7 +764,9 @@ bool Target::fromMap(const QVariantMap &map)
QVariantMap valueMap = map.value(key).toMap(); QVariantMap valueMap = map.value(key).toMap();
DeployConfigurationFactory *factory = DeployConfigurationFactory::find(this, valueMap); DeployConfigurationFactory *factory = DeployConfigurationFactory::find(this, valueMap);
if (!factory) { 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; continue;
} }
DeployConfiguration *dc = factory->restore(this, valueMap); 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. // Ignore missing RCs: We will just populate them using the default ones.
QVariantMap valueMap = map.value(key).toMap(); QVariantMap valueMap = map.value(key).toMap();
IRunConfigurationFactory *factory = IRunConfigurationFactory::find(this, valueMap); IRunConfigurationFactory *factory = IRunConfigurationFactory::find(this, valueMap);
if (!factory || !factory->canRestore(this, valueMap)) if (!factory)
continue; continue;
RunConfiguration *rc = factory->restore(this, valueMap); RunConfiguration *rc = factory->restore(this, valueMap);
if (!rc) if (!rc)