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

ProjectExplorer: Provide a ToolChain::isValid() base implementation

Browse Source 
It checks for an executable compilerCommand(). This was used in Gcc,
Clang and Nim before. MSVC still overrides with a different test.

The formerly unconditional 'return true' for Keil/IAR/Sdcc uses that
check now, too.

Change-Id: I433a5ac6784277dc77129b2671c28af6913327a7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-11-13 12:53:14 +01:00
parent 09e2d6306e
commit 5d5a4ffbf8
12 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/baremetal/iarewtoolchain.cpp
View File

@@ -296,11 +296,6 @@ IarToolChain::IarToolChain() :
setCompilerCommandKey("CompilerPath");
}
bool IarToolChain::isValid() const
{
return true;
}
ToolChain::MacroInspectionRunner IarToolChain::createMacroInspectionRunner() const
{
Environment env = Environment::systemEnvironment();

2
src/plugins/baremetal/iarewtoolchain.h
View File

@@ -53,8 +53,6 @@ class IarToolChain final : public ProjectExplorer::ToolChain
Q_DECLARE_TR_FUNCTIONS(IarToolChain)
public:
bool isValid() const final;
MacroInspectionRunner createMacroInspectionRunner() const final;
Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const final;

5
src/plugins/baremetal/keiltoolchain.cpp
View File

@@ -435,11 +435,6 @@ KeilToolChain::KeilToolChain() :
setCompilerCommandKey("CompilerPath");
}
bool KeilToolChain::isValid() const
{
return true;
}
ToolChain::MacroInspectionRunner KeilToolChain::createMacroInspectionRunner() const
{
Environment env = Environment::systemEnvironment();

2
src/plugins/baremetal/keiltoolchain.h
View File

@@ -53,8 +53,6 @@ class KeilToolChain final : public ProjectExplorer::ToolChain
Q_DECLARE_TR_FUNCTIONS(KeilToolChain)
public:
bool isValid() const final;
MacroInspectionRunner createMacroInspectionRunner() const final;
Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const final;

5
src/plugins/baremetal/sdcctoolchain.cpp
View File

@@ -219,11 +219,6 @@ SdccToolChain::SdccToolChain() :
setCompilerCommandKey("CompilerPath");
}
bool SdccToolChain::isValid() const
{
return true;
}
ToolChain::MacroInspectionRunner SdccToolChain::createMacroInspectionRunner() const
{
Environment env = Environment::systemEnvironment();

2
src/plugins/baremetal/sdcctoolchain.h
View File

@@ -52,8 +52,6 @@ class SdccToolChain final : public ProjectExplorer::ToolChain
Q_DECLARE_TR_FUNCTIONS(SdccToolChain)
public:
bool isValid() const final;
MacroInspectionRunner createMacroInspectionRunner() const final;
Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const final;

8
src/plugins/nim/project/nimtoolchain.cpp
View File

@@ -53,14 +53,6 @@ NimToolChain::NimToolChain(Utils::Id typeId)
setCompilerCommandKey("Nim.NimToolChain.CompilerCommand");
}
bool NimToolChain::isValid() const
{
if (compilerCommand().isEmpty())
return false;
QFileInfo fi = compilerCommand().toFileInfo();
return fi.isExecutable();
}
ToolChain::MacroInspectionRunner NimToolChain::createMacroInspectionRunner() const
{
return ToolChain::MacroInspectionRunner();

2
src/plugins/nim/project/nimtoolchain.h
View File

@@ -38,8 +38,6 @@ public:
NimToolChain();
explicit NimToolChain(Utils::Id typeId);
bool isValid() const override;
MacroInspectionRunner createMacroInspectionRunner() const override;
Utils::LanguageExtensions languageExtensions(const QStringList &flags) const final;
Utils::WarningFlags warningFlags(const QStringList &flags) const final;

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

@@ -344,15 +344,6 @@ Abis GccToolChain::supportedAbis() const
return m_supportedAbis;
}
bool GccToolChain::isValid() const
{
if (compilerCommand().isEmpty())
return false;
QFileInfo fi = compilerCommand().toFileInfo();
return fi.isExecutable();
}
static bool isNetworkCompiler(const QString &dirPath)
{
return dirPath.contains("icecc") || dirPath.contains("distcc");

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

@@ -75,7 +75,6 @@ public:
Utils::FilePath installDir() const override;
QString version() const;
Abis supportedAbis() const override;
bool isValid() const override;
Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const override;
Utils::WarningFlags warningFlags(const QStringList &cflags) const override;

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

@@ -159,6 +159,14 @@ Abis ToolChain::supportedAbis() const
return {targetAbi()};
}
bool ToolChain::isValid() const
{
if (compilerCommand().isEmpty())
return false;
QFileInfo fi = compilerCommand().toFileInfo();
return fi.isExecutable();
}
QStringList ToolChain::includedFiles(const QStringList &flags, const QString &directory) const
{
Q_UNUSED(flags)

2
src/plugins/projectexplorer/toolchain.h
View File

@@ -103,7 +103,7 @@ public:
virtual QStringList extraCodeModelFlags() const { return QStringList(); }
virtual Utils::FilePath installDir() const { return Utils::FilePath(); }
virtual bool isValid() const = 0;
virtual bool isValid() const;
virtual Utils::LanguageExtensions languageExtensions(const QStringList &cxxflags) const = 0;
virtual Utils::WarningFlags warningFlags(const QStringList &cflags) const = 0;