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

AbstractProcessStep: Hide some methods in protected section

Browse Source 
Change-Id: Ibc306288c35c4826123b6146e568d55d533e07a9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-07-10 17:22:49 +02:00
parent 06a57f8c42
commit ed86673e84
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/abstractprocessstep.h
View File

@@ -25,11 +25,14 @@ class PROJECTEXPLORER_EXPORT AbstractProcessStep : public BuildStep
public: public:
ProcessParameters *processParameters(); ProcessParameters *processParameters();
bool setupProcessParameters(ProcessParameters *params) const;
protected:
AbstractProcessStep(BuildStepList *bsl, Utils::Id id);
~AbstractProcessStep() override;
bool setupProcessParameters(ProcessParameters *params) const;
bool ignoreReturnValue() const; bool ignoreReturnValue() const;
void setIgnoreReturnValue(bool b); void setIgnoreReturnValue(bool b);
void setCommandLineProvider(const std::function<Utils::CommandLine()> &provider); void setCommandLineProvider(const std::function<Utils::CommandLine()> &provider);
void setWorkingDirectoryProvider(const std::function<Utils::FilePath()> &provider); void setWorkingDirectoryProvider(const std::function<Utils::FilePath()> &provider);
void setEnvironmentModifier(const std::function<void(Utils::Environment &)> &modifier); void setEnvironmentModifier(const std::function<void(Utils::Environment &)> &modifier);
@@ -37,10 +40,6 @@ public:
void emitFaultyConfigurationMessage(); void emitFaultyConfigurationMessage();
protected:
AbstractProcessStep(BuildStepList *bsl, Utils::Id id);
~AbstractProcessStep() override;
bool init() override; bool init() override;
void setupOutputFormatter(Utils::OutputFormatter *formatter) override; void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
void doRun() override; void doRun() override;

4
src/plugins/qmakeprojectmanager/qmakemakestep.cpp
View File

@@ -209,9 +209,9 @@ void QmakeMakeStep::doRun()
} }
if (!m_makeFileToCheck.exists()) { if (!m_makeFileToCheck.exists()) {
if (!ignoreReturnValue())
emit addOutput(Tr::tr("Cannot find Makefile. Check your build settings."), BuildStep::OutputFormat::NormalMessage);
const bool success = ignoreReturnValue(); const bool success = ignoreReturnValue();
if (!success)
emit addOutput(Tr::tr("Cannot find Makefile. Check your build settings."), BuildStep::OutputFormat::NormalMessage);
emit finished(success); emit finished(success);
return; return;
} }