From ed86673e84067bbec83ddeea343a31a8c2f29559 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 10 Jul 2023 17:22:49 +0200
Subject: [PATCH] AbstractProcessStep: Hide some methods in protected section

Change-Id: Ibc306288c35c4826123b6146e568d55d533e07a9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/projectexplorer/abstractprocessstep.h | 11 +++++------
 src/plugins/qmakeprojectmanager/qmakemakestep.cpp |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h
index fc1ed131357..0ac03036d8f 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.h
+++ b/src/plugins/projectexplorer/abstractprocessstep.h
@@ -25,11 +25,14 @@ class PROJECTEXPLORER_EXPORT AbstractProcessStep : public BuildStep
 
 public:
     ProcessParameters *processParameters();
-    bool setupProcessParameters(ProcessParameters *params) const;
 
+protected:
+    AbstractProcessStep(BuildStepList *bsl, Utils::Id id);
+    ~AbstractProcessStep() override;
+
+    bool setupProcessParameters(ProcessParameters *params) const;
     bool ignoreReturnValue() const;
     void setIgnoreReturnValue(bool b);
-
     void setCommandLineProvider(const std::function<Utils::CommandLine()> &provider);
     void setWorkingDirectoryProvider(const std::function<Utils::FilePath()> &provider);
     void setEnvironmentModifier(const std::function<void(Utils::Environment &)> &modifier);
@@ -37,10 +40,6 @@ public:
 
     void emitFaultyConfigurationMessage();
 
-protected:
-    AbstractProcessStep(BuildStepList *bsl, Utils::Id id);
-    ~AbstractProcessStep() override;
-
     bool init() override;
     void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
     void doRun() override;
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
index e72d3467582..47e6470f602 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
@@ -209,9 +209,9 @@ void QmakeMakeStep::doRun()
     }
 
     if (!m_makeFileToCheck.exists()) {
-        if (!ignoreReturnValue())
-            emit addOutput(Tr::tr("Cannot find Makefile. Check your build settings."), BuildStep::OutputFormat::NormalMessage);
         const bool success = ignoreReturnValue();
+        if (!success)
+            emit addOutput(Tr::tr("Cannot find Makefile. Check your build settings."), BuildStep::OutputFormat::NormalMessage);
         emit finished(success);
         return;
     }