forked from qt-creator/qt-creator
Revert "Qmake: Show real effective make call on Make step"
This caused passing "-f Makefile.name" twice to make.
This reverts commit aa198b7e88
.
Change-Id: I8fb2a014a76d3c6d9857881aa91b2664866269cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
committed by
Orgad Shaneh
parent
f88ad0e9d0
commit
e43288baf4
@@ -323,11 +323,6 @@ void MakeStep::setUserArguments(const QString &args)
|
||||
m_userArguments = args;
|
||||
}
|
||||
|
||||
QStringList MakeStep::autoArguments() const
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
FilePath MakeStep::makeCommand() const
|
||||
{
|
||||
return m_makeCommand;
|
||||
@@ -337,7 +332,6 @@ CommandLine MakeStep::effectiveMakeCommand() const
|
||||
{
|
||||
CommandLine cmd(m_makeCommand.isEmpty() ? defaultMakeCommand() : m_makeCommand);
|
||||
|
||||
cmd.addArgs(autoArguments());
|
||||
cmd.addArgs(m_userArguments, CommandLine::Raw);
|
||||
cmd.addArgs(jobArguments());
|
||||
cmd.addArgs(m_buildTargets);
|
||||
@@ -428,8 +422,6 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
|
||||
this, &MakeStepConfigWidget::updateDetails);
|
||||
connect(m_makeStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged,
|
||||
this, &MakeStepConfigWidget::updateDetails);
|
||||
connect(m_makeStep->project(), &Project::parsingFinished,
|
||||
this, &MakeStepConfigWidget::updateDetails);
|
||||
|
||||
Core::VariableChooser::addSupportForChildWidgets(this, m_makeStep->macroExpander());
|
||||
}
|
||||
|
@@ -83,7 +83,6 @@ public:
|
||||
|
||||
protected:
|
||||
bool fromMap(const QVariantMap &map) override;
|
||||
virtual QStringList autoArguments() const;
|
||||
|
||||
private:
|
||||
QVariantMap toMap() const override;
|
||||
|
@@ -212,14 +212,6 @@ void QmakeMakeStep::finish(bool success)
|
||||
MakeStep::finish(success);
|
||||
}
|
||||
|
||||
QStringList QmakeMakeStep::autoArguments() const
|
||||
{
|
||||
const auto bc = static_cast<QmakeBuildConfiguration *>(buildConfiguration());
|
||||
if (bc && !bc->makefile().isEmpty())
|
||||
return {"-f", bc->makefile()};
|
||||
return {};
|
||||
}
|
||||
|
||||
///
|
||||
// QmakeMakeStepFactory
|
||||
///
|
||||
|
@@ -53,7 +53,6 @@ private:
|
||||
void finish(bool success) override;
|
||||
bool init() override;
|
||||
void doRun() override;
|
||||
QStringList autoArguments() const override;
|
||||
|
||||
bool m_scriptTarget = false;
|
||||
QString m_makeFileToCheck;
|
||||
|
Reference in New Issue
Block a user