From 988c41642551feaa46ee3306cf3d689a6b85a872 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 10 May 2021 14:32:03 +0200 Subject: [PATCH] Fix build after merge Change-Id: I350630bdc4fb34ea1d443aee1c8b3c823fc1e6a8 Reviewed-by: hjk Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/makestep.h | 2 +- src/plugins/remotelinux/makeinstallstep.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h index 4db8f18b70e..d1865caea8c 100644 --- a/src/plugins/projectexplorer/makestep.h +++ b/src/plugins/projectexplorer/makestep.h @@ -90,7 +90,7 @@ protected: Utils::StringAspect *makeCommandAspect() const { return m_makeCommandAspect; } Utils::MultiSelectionAspect *buildTargetsAspect() const { return m_buildTargetsAspect; } Utils::StringAspect *userArgumentsAspect() const { return m_userArgumentsAspect; } - Utils::AspectContainer *jobCountContainer() const { return m_jobCountContainer; } + Utils::IntegerAspect *jobCountAspect() const { return m_userJobCountAspect; } Utils::BoolAspect *disabledForSubdirsAspect() const { return m_disabledForSubdirsAspect; } diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp index d7f970b9e2e..72d9f22e232 100644 --- a/src/plugins/remotelinux/makeinstallstep.cpp +++ b/src/plugins/remotelinux/makeinstallstep.cpp @@ -61,7 +61,7 @@ MakeInstallStep::MakeInstallStep(BuildStepList *parent, Utils::Id id) : MakeStep makeCommandAspect()->setVisible(false); buildTargetsAspect()->setVisible(false); userArgumentsAspect()->setVisible(false); - jobCountContainer()->setVisible(false); + jobCountAspect()->setVisible(false); disabledForSubdirsAspect()->setVisible(false); const auto makeAspect = addAspect();