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

10
src/plugins/qt4projectmanager/qt4target.cpp
View File

@@ -57,9 +57,9 @@ QString displayNameForId(const QString &id) {
if (id == QLatin1String(DESKTOP_TARGET_ID))
return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "Desktop", "Qt4 Desktop target display name");
if (id == QLatin1String(S60_EMULATOR_TARGET_ID))
return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "S60 Emulator", "Qt4 S60 Emulator target display name");
return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "Symbian Emulator", "Qt4 Symbian Emulator target display name");
if (id == QLatin1String(S60_DEVICE_TARGET_ID))
return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "S60 Device", "Qt4 S60 Device target display name");
return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "Symbian Device", "Qt4 Symbian Device target display name");
if (id == QLatin1String(MAEMO_EMULATOR_TARGET_ID))
return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "Maemo Emulator", "Qt4 Maemo Emulator target display name");
if (id == QLatin1String(MAEMO_DEVICE_TARGET_ID))
@@ -382,10 +382,8 @@ bool Qt4Target::fromMap(const QVariantMap &map)
if (!Target::fromMap(map))
return false;
if (displayName().isEmpty())
setDisplayName(displayNameForId(id()));
if (icon().isNull())
setIcon(iconForId(id()));
setDisplayName(displayNameForId(id()));
updateToolTipAndIcon();
return true;
}