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

QmakeProject: Rework allProFiles()

Browse Source 
Change-Id: I49309565368fb8e00dd5a67c0e3ac77392924c75
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Daniel Teske
2014-06-04 12:50:10 +02:00
parent 0926da3a03
commit 241d3a1ef6
4 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,11 +90,15 @@ QList<Core::Id> AndroidRunConfigurationFactory::availableCreationIds(Target *par
QList<Core::Id> ids;
if (!AndroidManager::supportsAndroid(parent))
return ids;
QList<QmakeProFileNode *> nodes = static_cast<QmakeProject *>(parent->project())->allProFiles();
QmakeProject *project = static_cast<QmakeProject *>(parent->project());
QList<QmakeProFileNode *> nodes = project->allProFiles(QList<QmakeProjectType>()
<< ApplicationTemplate
<< LibraryTemplate);
const Core::Id base = Core::Id(ANDROID_RC_ID_PREFIX);
foreach (QmakeProFileNode *node, nodes)
if (node->projectType() == ApplicationTemplate || node->projectType() == LibraryTemplate)
ids << base.withSuffix(node->path());
ids << base.withSuffix(node->path());
return ids;
}