feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Simplify use of Core::Id

Browse Source 
Change-Id: Ie07b8b97be37424e642265e706662af9f2102632
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2013-03-19 12:48:13 +01:00
parent dcb8d86ef8
commit 11cd0e5b1b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidrunfactories.cpp
View File

@@ -53,7 +53,7 @@ namespace Android {
namespace Internal { namespace Internal {
#define ANDROID_PREFIX "Qt4ProjectManager.AndroidRunConfiguration" #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) static QString pathFromId(const Core::Id id)
{ {
@@ -96,9 +96,10 @@ QList<Core::Id> AndroidRunConfigurationFactory::availableCreationIds(Target *par
if (!AndroidManager::supportsAndroid(parent)) if (!AndroidManager::supportsAndroid(parent))
return ids; return ids;
QList<Qt4ProFileNode *> nodes = static_cast<Qt4Project *>(parent->project())->allProFiles(); QList<Qt4ProFileNode *> nodes = static_cast<Qt4Project *>(parent->project())->allProFiles();
const Core::Id base = Core::Id(ANDROID_RC_ID_PREFIX);
foreach (Qt4ProFileNode *node, nodes) foreach (Qt4ProFileNode *node, nodes)
if (node->projectType() == ApplicationTemplate || node->projectType() == LibraryTemplate) 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; return ids;
} }