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

Symbian is the term. Also unconditionally reset target names.

Browse Source 
Since the target names are translated, we cannot use the saved
display name from the user file.

Reviewed-by: Tobias Hunger
This commit is contained in:
con
2010-02-10 12:16:01 +01:00
parent 8548da1c30
commit 686b21195d
8 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,6 @@ const char * const ACTIVE_RC_KEY("ProjectExplorer.Target.ActiveRunConfiguration"
const char * const RC_KEY_PREFIX("ProjectExplorer.Target.RunConfiguration.");
const char * const RC_COUNT_KEY("ProjectExplorer.Target.RunConfigurationCount");
const char * const ICON_KEY("ProjectExplorer.Target.Icon");
} // namespace
// -------------------------------------------------------------------------
@@ -241,8 +240,6 @@ QVariantMap Target::toMap() const
for (int i = 0; i < rcs.size(); ++i)
map.insert(QString::fromLatin1(RC_KEY_PREFIX) + QString::number(i), rcs.at(i)->toMap());
map.insert(QLatin1String(ICON_KEY), m_icon);
return map;
}
@@ -260,8 +257,6 @@ bool Target::fromMap(const QVariantMap &map)
if (!ProjectConfiguration::fromMap(map))
return false;
m_icon = map.value(QLatin1String(ICON_KEY)).value<QIcon>();
bool ok;
int bcCount(map.value(QLatin1String(BC_COUNT_KEY), 0).toInt(&ok));
if (!ok || bcCount < 0)