Commit 3d5ec357 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Make sure a display name is set for targets

 * Make sure we have a display name set for targets when restoring
   from Qt creator 1.3.1 .user files.
parent fd2daeab
...@@ -221,7 +221,7 @@ Qt4Target *Qt4TargetFactory::restore(ProjectExplorer::Project *parent, const QVa ...@@ -221,7 +221,7 @@ Qt4Target *Qt4TargetFactory::restore(ProjectExplorer::Project *parent, const QVa
if (!canRestore(parent, map)) if (!canRestore(parent, map))
return 0; return 0;
Qt4Project * qt4project(static_cast<Qt4Project *>(parent)); Qt4Project *qt4project(static_cast<Qt4Project *>(parent));
Qt4Target *t(new Qt4Target(qt4project, QLatin1String("transient ID"))); Qt4Target *t(new Qt4Target(qt4project, QLatin1String("transient ID")));
if (t->fromMap(map)) if (t->fromMap(map))
return t; return t;
...@@ -406,6 +406,7 @@ bool Qt4Target::fromMap(const QVariantMap &map) ...@@ -406,6 +406,7 @@ bool Qt4Target::fromMap(const QVariantMap &map)
{ {
bool success = Target::fromMap(map); bool success = Target::fromMap(map);
setIcon(iconForId(id())); setIcon(iconForId(id()));
setDefaultDisplayName(displayNameForId(id()));
return success; return success;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment