From 1e6eb1ba282b233d39677287bf831d65a1e4196f Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 3 Jul 2023 17:09:00 +0200
Subject: [PATCH] RemoteLinux: Un-publish MakeInstallStep

... and move definition into .cpp.

It is by now only needed there, and we don't want to encourge
re-using bits and pieces of step implementation by inheritance.

Change-Id: I12899c5e6a6c94cc9cfb23a2756621a4213f5dae
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/remotelinux/makeinstallstep.cpp | 30 ++++++++++++++++++--
 src/plugins/remotelinux/makeinstallstep.h   | 31 +--------------------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp
index 13465b57254..56c22d4ff80 100644
--- a/src/plugins/remotelinux/makeinstallstep.cpp
+++ b/src/plugins/remotelinux/makeinstallstep.cpp
@@ -12,6 +12,7 @@
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
+#include <projectexplorer/makestep.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runconfigurationaspects.h>
@@ -23,8 +24,6 @@
 #include <utils/process.h>
 #include <utils/qtcassert.h>
 
-#include <QDirIterator>
-#include <QFileInfo>
 #include <QSet>
 #include <QTemporaryDir>
 
@@ -39,6 +38,33 @@ const char CleanInstallRootAspectId[] = "RemoteLinux.MakeInstall.CleanInstallRoo
 const char FullCommandLineAspectId[] = "RemoteLinux.MakeInstall.FullCommandLine";
 const char CustomCommandLineAspectId[] = "RemoteLinux.MakeInstall.CustomCommandLine";
 
+class MakeInstallStep : public MakeStep
+{
+public:
+    MakeInstallStep(BuildStepList *parent, Id id);
+
+private:
+    bool fromMap(const QVariantMap &map) override;
+    QWidget *createConfigWidget() override;
+    bool init() override;
+    void finish(ProcessResult result) override;
+    bool isJobCountSupported() const override { return false; }
+
+    FilePath installRoot() const;
+    bool cleanInstallRoot() const;
+
+    void updateCommandFromAspect();
+    void updateArgsFromAspect();
+    void updateFullCommandLine();
+    void updateFromCustomCommandLineAspect();
+
+    StringAspect *customCommandLineAspect() const;
+
+    DeploymentData m_deploymentData;
+    bool m_noInstallTarget = false;
+    bool m_isCmakeProject = false;
+};
+
 MakeInstallStep::MakeInstallStep(BuildStepList *parent, Id id) : MakeStep(parent, id)
 {
     m_makeCommandAspect.setVisible(false);
diff --git a/src/plugins/remotelinux/makeinstallstep.h b/src/plugins/remotelinux/makeinstallstep.h
index 3be2d5df979..564a262abcd 100644
--- a/src/plugins/remotelinux/makeinstallstep.h
+++ b/src/plugins/remotelinux/makeinstallstep.h
@@ -5,39 +5,10 @@
 
 #include "remotelinux_export.h"
 
-#include <projectexplorer/deploymentdata.h>
-#include <projectexplorer/makestep.h>
+#include <projectexplorer/buildstep.h>
 
 namespace RemoteLinux {
 
-class REMOTELINUX_EXPORT MakeInstallStep : public ProjectExplorer::MakeStep
-{
-    Q_OBJECT
-public:
-    MakeInstallStep(ProjectExplorer::BuildStepList *parent, Utils::Id id);
-
-private:
-    bool fromMap(const QVariantMap &map) override;
-    QWidget *createConfigWidget() override;
-    bool init() override;
-    void finish(Utils::ProcessResult result) override;
-    bool isJobCountSupported() const override { return false; }
-
-    Utils::FilePath installRoot() const;
-    bool cleanInstallRoot() const;
-
-    void updateCommandFromAspect();
-    void updateArgsFromAspect();
-    void updateFullCommandLine();
-    void updateFromCustomCommandLineAspect();
-
-    Utils::StringAspect *customCommandLineAspect() const;
-
-    ProjectExplorer::DeploymentData m_deploymentData;
-    bool m_noInstallTarget = false;
-    bool m_isCmakeProject = false;
-};
-
 class REMOTELINUX_EXPORT MakeInstallStepFactory
     : public ProjectExplorer::BuildStepFactory
 {