Kit: Introduce variables for Kit display names

This change also adds a AbstractMacroExpander for the QtKitInformation.

It supports the following variables in the Kit display name:

 %{Qt:version} - Qt version number
 %{Qt:type}    - Qt type
 %{Qt:name}    - Qt version name
 %{Qt:mkspec}  - mkspec used by the Qt version

Task-number: QTCREATORBUG-11118
Change-Id: I7263781336ab561c34880b187ebd55e81e6ca215
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp
index 2ccdea0d95..0208260672 100644
--- a/src/plugins/projectexplorer/projectimporter.cpp
+++ b/src/plugins/projectexplorer/projectimporter.cpp
@@ -60,7 +60,7 @@ void ProjectImporter::markTemporary(Kit *k)
     setIsUpdating(true);
 
     const QString name = k->displayName();
-    k->setDisplayName(QCoreApplication::translate("ProjectExplorer::ProjectImporter",
+    k->setUnexpandedDisplayName(QCoreApplication::translate("ProjectExplorer::ProjectImporter",
                                                   "%1 - temporary").arg(name));
 
     k->setValue(KIT_TEMPORARY_NAME, k->displayName());
@@ -81,7 +81,7 @@ void ProjectImporter::makePermanent(Kit *k)
     k->removeKey(TEMPORARY_OF_PROJECTS);
     const QString tempName = k->value(KIT_TEMPORARY_NAME).toString();
     if (!tempName.isNull() && k->displayName() == tempName)
-        k->setDisplayName(k->value(KIT_FINAL_NAME).toString());
+        k->setUnexpandedDisplayName(k->value(KIT_FINAL_NAME).toString());
     k->removeKey(KIT_TEMPORARY_NAME);
     k->removeKey(KIT_FINAL_NAME);