Symbian is the term. Also unconditionally reset target names.

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

Reviewed-by: Tobias Hunger

1 files changed, 4 insertions, 6 deletions

diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp
index 03aac13528..497a9d17e9 100644
--- a/src/plugins/qt4projectmanager/qt4target.cpp
+++ b/src/plugins/qt4projectmanager/qt4target.cpp
@@ -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;
 }