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

Revert "Qmake: Show real effective make call on Make step"

Browse Source 
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:
Orgad Shaneh
2019-09-24 22:51:58 +03:00
committed by Orgad Shaneh
parent f88ad0e9d0
commit e43288baf4
4 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/makestep.cpp
View File

@@ -323,11 +323,6 @@ void MakeStep::setUserArguments(const QString &args)
m_userArguments = args; m_userArguments = args;
} }
QStringList MakeStep::autoArguments() const
{
return {};
}
FilePath MakeStep::makeCommand() const FilePath MakeStep::makeCommand() const
{ {
return m_makeCommand; return m_makeCommand;
@@ -337,7 +332,6 @@ CommandLine MakeStep::effectiveMakeCommand() const
{ {
CommandLine cmd(m_makeCommand.isEmpty() ? defaultMakeCommand() : m_makeCommand); CommandLine cmd(m_makeCommand.isEmpty() ? defaultMakeCommand() : m_makeCommand);
cmd.addArgs(autoArguments());
cmd.addArgs(m_userArguments, CommandLine::Raw); cmd.addArgs(m_userArguments, CommandLine::Raw);
cmd.addArgs(jobArguments()); cmd.addArgs(jobArguments());
cmd.addArgs(m_buildTargets); cmd.addArgs(m_buildTargets);
@@ -428,8 +422,6 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
this, &MakeStepConfigWidget::updateDetails); this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged, connect(m_makeStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged,
this, &MakeStepConfigWidget::updateDetails); this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->project(), &Project::parsingFinished,
this, &MakeStepConfigWidget::updateDetails);
Core::VariableChooser::addSupportForChildWidgets(this, m_makeStep->macroExpander()); Core::VariableChooser::addSupportForChildWidgets(this, m_makeStep->macroExpander());
} }

1
src/plugins/projectexplorer/makestep.h
View File

@@ -83,7 +83,6 @@ public:
protected: protected:
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;
virtual QStringList autoArguments() const;
private: private:
QVariantMap toMap() const override; QVariantMap toMap() const override;

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

@@ -212,14 +212,6 @@ void QmakeMakeStep::finish(bool success)
MakeStep::finish(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 // QmakeMakeStepFactory
/// ///

1
src/plugins/qmakeprojectmanager/qmakemakestep.h
View File

@@ -53,7 +53,6 @@ private:
void finish(bool success) override; void finish(bool success) override;
bool init() override; bool init() override;
void doRun() override; void doRun() override;
QStringList autoArguments() const override;
bool m_scriptTarget = false; bool m_scriptTarget = false;
QString m_makeFileToCheck; QString m_makeFileToCheck;