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

ProjectExplorer: De-duplicate two overrides of ToolChain::makeCommand

Browse Source 
They originally were identical, but already started diverging.

Change-Id: I977f0e54d1ba308bbeddd775ac0e903f6f359234
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Alessandro Portale
2020-11-05 03:16:11 +01:00
parent 888ea6bbbb
commit aadc28a924
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -1484,7 +1484,7 @@ ClangToolChain::~ClangToolChain()
QObject::disconnect(m_mingwToolchainAddedConnection); QObject::disconnect(m_mingwToolchainAddedConnection);
} }
FilePath ClangToolChain::makeCommand(const Environment &environment) const static FilePath mingwAwareMakeCommand(const Environment &environment)
{ {
const QStringList makes const QStringList makes
= HostOsInfo::isWindowsHost() ? QStringList({"mingw32-make.exe", "make.exe"}) : QStringList({"make"}); = HostOsInfo::isWindowsHost() ? QStringList({"mingw32-make.exe", "make.exe"}) : QStringList({"make"});
@@ -1498,6 +1498,11 @@ FilePath ClangToolChain::makeCommand(const Environment &environment) const
return FilePath::fromString(makes.first()); return FilePath::fromString(makes.first());
} }
FilePath ClangToolChain::makeCommand(const Environment &environment) const
{
return mingwAwareMakeCommand(environment);
}
/** /**
* @brief Similar to \a GccToolchain::languageExtensions, but recognizes * @brief Similar to \a GccToolchain::languageExtensions, but recognizes
* "-fborland-extensions". * "-fborland-extensions".
@@ -1820,16 +1825,7 @@ QStringList MingwToolChain::suggestedMkspecList() const
FilePath MingwToolChain::makeCommand(const Environment &environment) const FilePath MingwToolChain::makeCommand(const Environment &environment) const
{ {
const QStringList makes return mingwAwareMakeCommand(environment);
= HostOsInfo::isWindowsHost() ? QStringList({"mingw32-make.exe", "make.exe"}) : QStringList({"make"});
FilePath tmp;
foreach (const QString &make, makes) {
tmp = environment.searchInPath(make);
if (!tmp.isEmpty())
return tmp;
}
return FilePath::fromString(makes.first());
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------