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

ProjectExplorer: Introduce a ProjectConfiguration::kit() function

Browse Source 
For convenience, and use it in some places.

Change-Id: I8f7cb502b37b2fbf4cf2d17cac9c6299558332dc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-09-07 15:56:18 +02:00
parent 552a1296fe
commit 61bfd32438
34 changed files with 82 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/mesonprojectmanager/project/mesonbuildsystem.cpp
View File

@@ -59,7 +59,7 @@ static Q_LOGGING_CATEGORY(mesonBuildSystemLog, "qtc.meson.buildsystem", QtDebugM
MesonBuildSystem::MesonBuildSystem(MesonBuildConfiguration *bc)
: ProjectExplorer::BuildSystem{bc}
, m_parser{MesonToolKitAspect::mesonToolId(bc->target()->kit()), bc->environment(), project()}
, m_parser{MesonToolKitAspect::mesonToolId(bc->kit()), bc->environment(), project()}
{
init();
}
@@ -105,7 +105,7 @@ void MesonBuildSystem::parsingCompleted(bool success)
ProjectExplorer::Kit *MesonBuildSystem::MesonBuildSystem::kit()
{
return buildConfiguration()->target()->kit();
return buildConfiguration()->kit();
}
QStringList MesonBuildSystem::configArgs(bool isSetup)

4
src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
View File

@@ -145,7 +145,7 @@ BuildStepConfigWidget *NinjaBuildStep::createConfigWidget()
Utils::CommandLine NinjaBuildStep::command()
{
Utils::CommandLine cmd = [this] {
auto tool = NinjaToolKitAspect::ninjaTool(target()->kit());
auto tool = NinjaToolKitAspect::ninjaTool(kit());
if (tool)
return Utils::CommandLine{tool->exe()};
return Utils::CommandLine{};
@@ -207,7 +207,7 @@ void NinjaBuildStep::setupOutputFormatter(Utils::OutputFormatter *formatter)
m_ninjaParser = new NinjaParser;
m_ninjaParser->setSourceDirectory(project()->projectDirectory());
formatter->addLineParser(m_ninjaParser);
auto additionalParsers = target()->kit()->createOutputParsers();
auto additionalParsers = kit()->createOutputParsers();
std::for_each(std::cbegin(additionalParsers),
std::cend(additionalParsers),
[this](const auto parser) { parser->setRedirectionDetector(m_ninjaParser); });