forked from qt-creator/qt-creator
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:
@@ -45,11 +45,11 @@ protected:
|
|||||||
void setDisplayedParameters(ProcessParameters *params);
|
void setDisplayedParameters(ProcessParameters *params);
|
||||||
|
|
||||||
virtual void finish(bool success);
|
virtual void finish(bool success);
|
||||||
virtual void processStartupFailed();
|
|
||||||
virtual void stdOutput(const QString &output);
|
virtual void stdOutput(const QString &output);
|
||||||
virtual void stdError(const QString &output);
|
virtual void stdError(const QString &output);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
void processStartupFailed();
|
||||||
ProcessParameters *displayedParameters() const;
|
ProcessParameters *displayedParameters() const;
|
||||||
virtual void processFinished(bool success);
|
virtual void processFinished(bool success);
|
||||||
void handleProcessDone();
|
void handleProcessDone();
|
||||||
|
@@ -294,12 +294,6 @@ void QMakeStep::setForced(bool b)
|
|||||||
m_forced = b;
|
m_forced = b;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QMakeStep::processStartupFailed()
|
|
||||||
{
|
|
||||||
m_needToRunQMake = true;
|
|
||||||
AbstractProcessStep::processStartupFailed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void QMakeStep::processFinished(bool success)
|
void QMakeStep::processFinished(bool success)
|
||||||
{
|
{
|
||||||
if (!success)
|
if (!success)
|
||||||
@@ -309,6 +303,8 @@ void QMakeStep::processFinished(bool success)
|
|||||||
|
|
||||||
void QMakeStep::finish(bool success)
|
void QMakeStep::finish(bool success)
|
||||||
{
|
{
|
||||||
|
if (!success)
|
||||||
|
m_needToRunQMake = true;
|
||||||
m_wasSuccess = success;
|
m_wasSuccess = success;
|
||||||
runNextCommand();
|
runNextCommand();
|
||||||
}
|
}
|
||||||
|
@@ -137,7 +137,6 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool fromMap(const QVariantMap &map) override;
|
bool fromMap(const QVariantMap &map) override;
|
||||||
void processStartupFailed() override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void finish(bool success) override;
|
void finish(bool success) override;
|
||||||
|
Reference in New Issue
Block a user