From e43288baf4ddbce144682dae57bf2189acbae8bc Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 24 Sep 2019 22:51:58 +0300
Subject: [PATCH] Revert "Qmake: Show real effective make call on Make step"

This caused passing "-f Makefile.name" twice to make.

This reverts commit aa198b7e885c447651c652ed98f2e9604f65201b.

Change-Id: I8fb2a014a76d3c6d9857881aa91b2664866269cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/projectexplorer/makestep.cpp          | 8 --------
 src/plugins/projectexplorer/makestep.h            | 1 -
 src/plugins/qmakeprojectmanager/qmakemakestep.cpp | 8 --------
 src/plugins/qmakeprojectmanager/qmakemakestep.h   | 1 -
 4 files changed, 18 deletions(-)

diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp
index add3f56feee..91cbfc43516 100644
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -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());
 }
diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h
index 57482992ee1..9bde1c41a41 100644
--- a/src/plugins/projectexplorer/makestep.h
+++ b/src/plugins/projectexplorer/makestep.h
@@ -83,7 +83,6 @@ public:
 
 protected:
     bool fromMap(const QVariantMap &map) override;
-    virtual QStringList autoArguments() const;
 
 private:
     QVariantMap toMap() const override;
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
index e3d20491f5c..ec318b63e63 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
@@ -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
 ///
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.h b/src/plugins/qmakeprojectmanager/qmakemakestep.h
index a1552bfe3ce..a1bd2b16493 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.h
@@ -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;