AbstractProcessStep: Devirtualize processStartupFailed()

Since the base implementation of processStartupFailed()
is always calling finish(false), we intercept this inside
QMakeStep::finish override and set m_needToRunQMake accordingly
instead of overriding processStartupFailed.

Change-Id: I1d42d0034521dfad55e5a7e75a2ab234ca76c88d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-12-02 14:30:42 +01:00
parent d726615546
commit 9f53ba5795
3 changed files with 3 additions and 8 deletions

View File

@@ -45,11 +45,11 @@ protected:
void setDisplayedParameters(ProcessParameters *params);
virtual void finish(bool success);
virtual void processStartupFailed();
virtual void stdOutput(const QString &output);
virtual void stdError(const QString &output);
private:
void processStartupFailed();
ProcessParameters *displayedParameters() const;
virtual void processFinished(bool success);
void handleProcessDone();

View File

@@ -294,12 +294,6 @@ void QMakeStep::setForced(bool b)
m_forced = b;
}
void QMakeStep::processStartupFailed()
{
m_needToRunQMake = true;
AbstractProcessStep::processStartupFailed();
}
void QMakeStep::processFinished(bool success)
{
if (!success)
@@ -309,6 +303,8 @@ void QMakeStep::processFinished(bool success)
void QMakeStep::finish(bool success)
{
if (!success)
m_needToRunQMake = true;
m_wasSuccess = success;
runNextCommand();
}

View File

@@ -137,7 +137,6 @@ public:
protected:
bool fromMap(const QVariantMap &map) override;
void processStartupFailed() override;
private:
void finish(bool success) override;