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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
This commit is contained in:
Eike Ziller
2015-09-01 12:57:51 +02:00
parent fb73a87033 a80f4d179b
commit 3b1a966cc8
62 changed files with 2582 additions and 2354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/project.cpp
View File

@@ -384,11 +384,8 @@ Project::RestoreResult Project::fromMap(const QVariantMap &map, QString *errorMe
for (int i = 0; i < maxI; ++i) {
const QString key(QString::fromLatin1(TARGET_KEY_PREFIX) + QString::number(i));
if (!map.contains(key)) {
if (errorMessage)
*errorMessage = tr("Target key %1 was not found in project settings.").arg(key);
return RestoreResult::Error;
}
if (!map.contains(key))
continue;
QVariantMap targetMap = map.value(key).toMap();
Target *t = restoreTarget(targetMap);