From 96b5fa208f10652ed808dac7d0fa9d03600d3661 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 19 Mar 2018 16:29:46 +0100 Subject: [PATCH] Qmake: Remove QmakeProject::runConfigurationCreators Not used anymore. Change-Id: Idba6fd4a8d6f4c7e251a78568b1da0debd93bf5f Reviewed-by: Christian Kandeler --- .../qmakeprojectmanager/qmakenodes.cpp | 3 +++ src/plugins/qmakeprojectmanager/qmakenodes.h | 1 - .../qmakeprojectmanager/qmakeproject.cpp | 26 ------------------- .../qmakeprojectmanager/qmakeproject.h | 5 ---- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 5d71c39c64f..72d5ba53cfe 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -27,9 +27,12 @@ #include "qmakeproject.h" #include +#include #include + #include +#include #include using namespace ProjectExplorer; diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h index 57f1b7bec84..8c1cddbaeb3 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.h +++ b/src/plugins/qmakeprojectmanager/qmakenodes.h @@ -31,7 +31,6 @@ #include namespace Utils { class FileName; } -namespace ProjectExplorer { class RunConfiguration; } namespace QmakeProjectManager { class QmakeProFileNode; diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 0e062cf6114..46fe4470bbd 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -780,32 +780,6 @@ QList QmakeProject::allProFiles(const QList &projec return list; } -QList -QmakeProject::runConfigurationCreators(const RunConfigurationFactory *factory, - const QList &projectTypes) -{ - QList realTypes = projectTypes; - if (realTypes.isEmpty()) - realTypes = {ProjectType::ApplicationTemplate, ProjectType::ScriptTemplate}; - - const QList files = allProFiles(realTypes); - const auto isQtcRunnable = [](const QmakeProFile *f) { return f->isQtcRunnable(); }; - const bool hasAnyQtcRunnable = Utils::anyOf(files, isQtcRunnable); - - return Utils::transform(files, [&](QmakeProFile *f) { - const QString targetName = f->filePath().toString(); - return RunConfigurationCreationInfo { - factory, - factory->runConfigurationBaseId(), - targetName, - QFileInfo(targetName).completeBaseName(), - (hasAnyQtcRunnable && !f->isQtcRunnable()) - ? RunConfigurationCreationInfo::ManualCreationOnly - : RunConfigurationCreationInfo::AlwaysCreate - }; - }); -} - void QmakeProject::activeTargetWasChanged() { if (m_activeTarget) { diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index 3036a1d5b58..2b27c3d079f 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -31,7 +31,6 @@ #include "qmakeparsernodes.h" #include -#include #include #include @@ -72,10 +71,6 @@ public: Parsing parse = ExactParse) const; QList applicationProFiles(Parsing parse = ExactParse) const; - QList runConfigurationCreators - (const ProjectExplorer::RunConfigurationFactory *factory, - const QList &projectTypes = {}); - static void notifyChanged(const Utils::FileName &name); /// \internal