From ed1ed2aa2483aac191c8dfa37abfc726fc5deb3a Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 7 May 2021 13:47:50 +0200
Subject: [PATCH] RemoteLinux: Fix "make install" step

Was mangled in 42ab5c84b9.

Fixes: QTCREATORBUG-25359
Change-Id: I0a4f69fc72433548d44461c3c7c02bd53708d12d
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/projectexplorer/makestep.h      | 7 +++++++
 src/plugins/remotelinux/makeinstallstep.cpp | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h
index 2b805b12640..464d62a900a 100644
--- a/src/plugins/projectexplorer/makestep.h
+++ b/src/plugins/projectexplorer/makestep.h
@@ -87,6 +87,13 @@ protected:
     void supportDisablingForSubdirs() { m_disablingForSubDirsSupported = true; }
     virtual QStringList displayArguments() const;
 
+    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::BoolAspect *disabledForSubdirsAspect() const { return m_disabledForSubdirsAspect; }
+
+
 private:
     static int defaultJobCount();
     QStringList jobArguments() const;
diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index d919d885a20..d7f970b9e2e 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -58,6 +58,12 @@ const char CustomCommandLineAspectId[] = "RemoteLinux.MakeInstall.CustomCommandL
 
 MakeInstallStep::MakeInstallStep(BuildStepList *parent, Utils::Id id) : MakeStep(parent, id)
 {
+    makeCommandAspect()->setVisible(false);
+    buildTargetsAspect()->setVisible(false);
+    userArgumentsAspect()->setVisible(false);
+    jobCountContainer()->setVisible(false);
+    disabledForSubdirsAspect()->setVisible(false);
+
     const auto makeAspect = addAspect<ExecutableAspect>();
     makeAspect->setId(MakeAspectId);
     makeAspect->setSettingsKey(MakeAspectId);