From 11cd0e5b1b4c378cd1388f871f5ba4ad341b5100 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Tue, 19 Mar 2013 12:48:13 +0100
Subject: [PATCH] Android: Simplify use of Core::Id

Change-Id: Ie07b8b97be37424e642265e706662af9f2102632
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 src/plugins/android/androidrunfactories.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/android/androidrunfactories.cpp b/src/plugins/android/androidrunfactories.cpp
index 986d4794bc9..e40fbf524b1 100644
--- a/src/plugins/android/androidrunfactories.cpp
+++ b/src/plugins/android/androidrunfactories.cpp
@@ -53,7 +53,7 @@ namespace Android {
 namespace Internal {
 
 #define ANDROID_PREFIX "Qt4ProjectManager.AndroidRunConfiguration"
-static QLatin1String ANDROID_RC_ID_PREFIX(ANDROID_PREFIX ":");
+static const char ANDROID_RC_ID_PREFIX[] = ANDROID_PREFIX ":";
 
 static QString pathFromId(const Core::Id id)
 {
@@ -96,9 +96,10 @@ QList<Core::Id> AndroidRunConfigurationFactory::availableCreationIds(Target *par
     if (!AndroidManager::supportsAndroid(parent))
         return ids;
     QList<Qt4ProFileNode *> nodes = static_cast<Qt4Project *>(parent->project())->allProFiles();
+    const Core::Id base = Core::Id(ANDROID_RC_ID_PREFIX);
     foreach (Qt4ProFileNode *node, nodes)
         if (node->projectType() == ApplicationTemplate || node->projectType() == LibraryTemplate)
-            ids << Core::Id(ANDROID_RC_ID_PREFIX + node->targetInformation().target);
+            ids << base.withSuffix(node->targetInformation().target);
     return ids;
 }