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

QmakeProject: Centralize some code for subproject runconfig handling

Browse Source 
Change-Id: Iecd8c326fc7fd1b1e7e5406fd899befc9fdd3c5b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2017-12-19 13:54:16 +01:00
parent 048a05584c
commit 4b7c82b131
7 changed files with 31 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -38,6 +38,25 @@ using namespace Utils;
namespace QmakeProjectManager {
static QList<RunConfiguration *> qmakeRunConfigurationsForNode(Target *t, const Node *node)
{
QList<RunConfiguration *> result;
QTC_ASSERT(t, return result);
const FileName file = node->filePath();
for (auto factory : IRunConfigurationFactory::allRunConfigurationFactories()) {
if (auto qmakeFactory = qobject_cast<QmakeRunConfigurationFactory *>(factory)) {
if (qmakeFactory->canHandle(t)) {
result.append(Utils::filtered(t->runConfigurations(), [qmakeFactory, file](RunConfiguration *rc) {
return qmakeFactory->hasRunConfigForProFile(rc, file);
}));
}
}
}
return result;
}
/*!
\class QmakePriFileNode
Implements abstract ProjectNode class
@@ -68,10 +87,7 @@ bool QmakePriFileNode::deploysFolder(const QString &folder) const
QList<RunConfiguration *> QmakePriFileNode::runConfigurations() const
{
QmakeRunConfigurationFactory *factory = QmakeRunConfigurationFactory::find(m_project->activeTarget());
if (factory)
return factory->runConfigurationsForNode(m_project->activeTarget(), this);
return QList<RunConfiguration *>();
return qmakeRunConfigurationsForNode(m_project->activeTarget(), this);
}
QmakeProFileNode *QmakePriFileNode::proFileNode() const
@@ -140,9 +156,7 @@ bool QmakePriFileNode::supportsAction(ProjectAction action, const Node *node) co
}
if (action == HasSubProjectRunConfigurations) {
Target *target = m_project->activeTarget();
QmakeRunConfigurationFactory *factory = QmakeRunConfigurationFactory::find(target);
return factory && !factory->runConfigurationsForNode(target, node).isEmpty();
return !qmakeRunConfigurationsForNode(m_project->activeTarget(), node).isEmpty();
}
return false;